Commit68fa34f

authored

ci: remove ci make concurrency to fix docker image race (#14027)

This PR removes the `-j` argument to `make` when building and pushing Docker images on merge to main.Seen here:https://github.com/coder/coder/actions/runs/10108431095/job/27954323032#step:9:119We ran into this previously in#13769 for the release workflow, but neglected to apply the same change to the CI workflow.

1 parent37a859f commit68fa34fCopy full SHA for 68fa34f

File tree

-2

lines changed

-2

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -788,13 +788,15 @@ jobs:`
`788`	`788`	`echo "tag=$tag" >> $GITHUB_OUTPUT`
`789`	`789`
`790`	`790`	`# build images for each architecture`
`791`		`- make -j build/coder_"$version"_linux_{amd64,arm64,armv7}.tag`
	`791`	`+ # note: omitting the -j argument to avoid race conditions when pushing`
	`792`	`+ make build/coder_"$version"_linux_{amd64,arm64,armv7}.tag`
`792`	`793`
`793`	`794`	`# only push if we are on main branch`
`794`	`795`	`if [ "${{ github.ref }}" == "refs/heads/main" ]; then`
`795`	`796`	`# build and push multi-arch manifest, this depends on the other images`
`796`	`797`	`# being pushed so will automatically push them`
`797`		`- make -j push/build/coder_"$version"_linux_{amd64,arm64,armv7}.tag`
	`798`	`+ # note: omitting the -j argument to avoid race conditions when pushing`
	`799`	`+ make push/build/coder_"$version"_linux_{amd64,arm64,armv7}.tag`
`798`	`800`
`799`	`801`	`# Define specific tags`
`800`	`802`	`tags=("$tag" "main" "latest")`

Comments

(0)