Skip to content

Commit d9655a7

Browse files
committed
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)
1 parent 249e9d6 commit d9655a7

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

.github/workflows/cd.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,11 @@ jobs:
455455
runs-on: ubuntu-latest
456456
needs: build-toolkit-cluster-cache
457457
if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')
458+
concurrency:
459+
# run the job sequentially to prevent Git conflicts from update-config-version action
460+
# (GitHub queues only 1 job at a time for the same concurrency group, which is fine)
461+
group: release-staging
462+
cancel-in-progress: false
458463
steps:
459464
- name: Checkout code
460465
uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4

0 commit comments

Comments
 (0)