Fixing concurrency shenanigans

monetr · Sep 26, 2021 · ff0435b · ff0435b
1 parent b518897
commit ff0435b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -23,7 +23,7 @@ on:
 jobs:
   analyze:
     concurrency:
-      group: ${{ github.head_ref }}
+      group: ${{ github.ref }}-${{ github.job }}
       cancel-in-progress: true
     name: Analyze
     runs-on: ubuntu-latest

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -9,7 +9,7 @@ jobs:
   test:
     timeout-minutes: 15
     concurrency:
-      group: ${{ github.ref }}
+      group: ${{ github.ref }}-${{ github.job }}
       cancel-in-progress: true
     name: Test
     runs-on: ubuntu-latest
@@ -44,7 +44,7 @@ jobs:
   pg-test:
     timeout-minutes: 10
     concurrency:
-      group: ${{ github.ref }}
+      group: ${{ github.ref }}-${{ github.job }}
       cancel-in-progress: true
     name: PostgreSQL Test
     runs-on: ubuntu-latest
@@ -92,7 +92,7 @@ jobs:
   container:
     timeout-minutes: 45
     concurrency:
-      group: ${{ github.ref }}
+      group: ${{ github.ref }}-${{ github.job }}
       cancel-in-progress: true
     needs:
       - "test"
@@ -122,7 +122,7 @@ jobs:
           tags: "ghcr.io/monetr/rest-api:${{ github.sha }}"
   docs-deploy:
     concurrency:
-      group: ${{ github.ref }}
+      group: ${{ github.ref }}-${{ github.job }}
       cancel-in-progress: true
     needs:
       - test
@@ -142,7 +142,7 @@ jobs:
           folder: docs
   staging:
     concurrency:
-      group: ${{ github.ref }}
+      group: ${{ github.ref }}-${{ github.job }}
       cancel-in-progress: true
     needs:
       - "test"