From 68fa34feaed9118671d509ac3dcd152bdbadbed0 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Fri, 26 Jul 2024 10:53:18 +0100 Subject: [PATCH] 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:119 We ran into this previously in #13769 for the release workflow, but neglected to apply the same change to the CI workflow. --- .github/workflows/ci.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7114c33cea..50a1ebe0e0 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -788,13 +788,15 @@ jobs: echo "tag=$tag" >> $GITHUB_OUTPUT # build images for each architecture - make -j build/coder_"$version"_linux_{amd64,arm64,armv7}.tag + # note: omitting the -j argument to avoid race conditions when pushing + make build/coder_"$version"_linux_{amd64,arm64,armv7}.tag # only push if we are on main branch if [ "${{ github.ref }}" == "refs/heads/main" ]; then # build and push multi-arch manifest, this depends on the other images # being pushed so will automatically push them - make -j push/build/coder_"$version"_linux_{amd64,arm64,armv7}.tag + # note: omitting the -j argument to avoid race conditions when pushing + make push/build/coder_"$version"_linux_{amd64,arm64,armv7}.tag # Define specific tags tags=("$tag" "main" "latest")