ci: prevent labelled workflows from clobbering each other

ibis-project · Feb 14, 2024 · 279357a · 279357a
1 parent 78dc393
commit 279357a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/.github/workflows/docs-preview.yml b/.github/workflows/docs-preview.yml
@@ -5,13 +5,12 @@ on:
     types:
       - labeled
 
-concurrency:
-  group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
-  cancel-in-progress: true
-
 jobs:
   docs_preview:
     runs-on: ubuntu-latest
+    concurrency:
+      group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}-${{ github.event.label.name }}
+      cancel-in-progress: true
     if: github.event.label.name == 'docs-preview'
     steps:
       - uses: tibdex/github-app-token@v2

diff --git a/.github/workflows/ibis-backends-cloud.yml b/.github/workflows/ibis-backends-cloud.yml
@@ -20,10 +20,6 @@ permissions:
   # rate limit while restricting GITHUB_TOKEN permissions elsewhere
   contents: read
 
-concurrency:
-  group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
-  cancel-in-progress: true
-
 env:
   FORCE_COLOR: "1"
   SQLALCHEMY_WARN_20: "1"
@@ -35,8 +31,9 @@ jobs:
     # only a single bigquery or snowflake run at a time, otherwise test data is
     # clobbered by concurrent runs
     concurrency:
-      group: ${{ matrix.backend.name }}-${{ matrix.python-version }}
+      group: ${{ matrix.backend.name }}-${{ matrix.python-version }}-${{ github.event.label.name || 'ci-run-cloud' }}
       cancel-in-progress: false
+
     runs-on: ubuntu-latest
     if: github.event_name == 'push' || github.event.label.name == 'ci-run-cloud'
     strategy: