From 9c6c32f1288765972eea5d378d3d6f6d46009fbe Mon Sep 17 00:00:00 2001
From: tommoral <thomas.moreau.2010@gmail.com>
Date: Tue, 4 Jun 2024 14:15:29 +0200
Subject: [PATCH] FIX concurrency issues

---
 .github/workflows/lint_benchmarks.yml | 13 ++++++-------
 .github/workflows/test_benchmarks.yml |  7 ++++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/lint_benchmarks.yml b/.github/workflows/lint_benchmarks.yml
index 69478b1..e78d77e 100644
--- 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
index 7a4f93d..76d0e00 100644
--- 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.