Merge branch 'main' into fix-configSchema

janus-idp · Oct 17, 2024 · 5a1e2f9 · 5a1e2f9
2 parents 086eb40 + 5cf60df
commit 5a1e2f9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml
@@ -6,9 +6,11 @@ env:
   TURBO_SCM_BASE: ${{ github.event.pull_request.base.sha }}
   TURBO_SCM_HEAD: ${{ github.sha }}
 
+# enforce only one action can run at a time for a given PR, and
+# when updating a PR, actions in progress will be cancelled to start a fresh one
 concurrency:
-  group: push
-  cancel-in-progress: false
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   build:

diff --git a/.github/workflows/pr-test.yaml b/.github/workflows/pr-test.yaml
@@ -6,9 +6,11 @@ env:
   TURBO_SCM_BASE: ${{ github.event.pull_request.base.sha }}
   TURBO_SCM_HEAD: ${{ github.sha }}
 
+# enforce only one action can run at a time for a given PR, and
+# when updating a PR, actions in progress will be cancelled to start a fresh one
 concurrency:
-  group: push
-  cancel-in-progress: false
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   test:

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -14,8 +14,9 @@ on:
       - 1.2.x
       - release-[0-9].[0-9]*
 
+# enforce only one release action at a time
 concurrency:
-  group: push
+  group: ${{ github.workflow }}
   cancel-in-progress: false
 
 jobs: