FIX concurrency issues

benchopt · Jun 4, 2024 · 9c6c32f · 9c6c32f
1 parent d4d850b
commit 9c6c32f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/lint_benchmarks.yml b/.github/workflows/lint_benchmarks.yml
@@ -1,19 +1,18 @@
 name: Lint
 
-
 on:
   workflow_call:
 
-# Cancel in-progress workflows when pushing
-# a new commit on the same branch
-concurrency:
-  group: ${{ github.workflow }}-${{ github.job }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   linter-flake8:
     runs-on: ubuntu-latest
 
+    # Cancel in-progress workflows when pushing
+    # a new commit on the same branch
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.job }}-${{ github.ref }}
+      cancel-in-progress: true
+
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python 3.8

diff --git a/.github/workflows/test_benchmarks.yml b/.github/workflows/test_benchmarks.yml
@@ -24,9 +24,6 @@ on:
 
 # Cancel in-progress workflows when pushing
 # a new commit on the same branch
-concurrency:
-  group: ${{ github.workflow }}-${{ github.job }}-${{ github.ref }}
-  cancel-in-progress: true
 
 jobs:
   test-benchmark:
@@ -45,6 +42,10 @@ jobs:
       BENCHOPT_DEBUG: 1
       BENCHOPT_CONDA_CMD: mamba
 
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}-${{ inputs.benchopt_version }}-${{ inputs.extra_args }}-${{ github.ref }}
+      cancel-in-progress: true
+
     defaults:
       run:
         # Need to use this shell to get conda working properly.