From d9655a72f23f643def46724a5211e7805a4a8027 Mon Sep 17 00:00:00 2001 From: Michal Baumgartner Date: Thu, 20 Nov 2025 17:04:04 +0100 Subject: [PATCH] fix(cd): Release to staging sequentially to prevent Git conflicts un the job sequentially to prevent Git conflicts from `update-config-version` action e.g. main and tagged release trigger CD job(s), the second job gets a conflict as it has checked out the branch before first job's commit has been automatically merged (first action already merged) --- .github/workflows/cd.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 6b97c6f..172c980 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -455,6 +455,11 @@ jobs: runs-on: ubuntu-latest needs: build-toolkit-cluster-cache if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/') + concurrency: + # run the job sequentially to prevent Git conflicts from update-config-version action + # (GitHub queues only 1 job at a time for the same concurrency group, which is fine) + group: release-staging + cancel-in-progress: false steps: - name: Checkout code uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4