From 8ce61fa42c2bfedb2048d7ecedaf470579377510 Mon Sep 17 00:00:00 2001
From: Quentin Bourgerie <bourgerie.quentin@gmail.com>
Date: Wed, 15 Mar 2023 09:49:11 +0100
Subject: [PATCH] chore(ci): Change concurrency groups seems broken with nested
 worflow

---
 .github/workflows/compiler_build_and_test_cpu.yml    | 4 ++--
 .github/workflows/compiler_build_and_test_gpu.yml    | 4 ++--
 .github/workflows/compiler_macos_build_and_test.yml  | 4 ++--
 .github/workflows/compiler_publish_docker_images.yml | 2 +-
 .github/workflows/concrete_cpu_test.yml              | 4 ++--
 .github/workflows/concrete_cuda_test.yml             | 4 ++--
 .github/workflows/concrete_python_build_and_test.yml | 4 ++--
 .github/workflows/main.yml                           | 4 ++--
 .github/workflows/optimizer.yml                      | 4 ++--
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/compiler_build_and_test_cpu.yml b/.github/workflows/compiler_build_and_test_cpu.yml
index d16d65f8a..89b78e28b 100644
--- a/.github/workflows/compiler_build_and_test_cpu.yml
+++ b/.github/workflows/compiler_build_and_test_cpu.yml
@@ -23,8 +23,8 @@ on:
         type: string
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
+  group: compiler_build_and_test_cpu-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 env:
   DOCKER_IMAGE_TEST: ghcr.io/zama-ai/concrete-compiler
diff --git a/.github/workflows/compiler_build_and_test_gpu.yml b/.github/workflows/compiler_build_and_test_gpu.yml
index 18b51b98a..9dfe2f5b7 100644
--- a/.github/workflows/compiler_build_and_test_gpu.yml
+++ b/.github/workflows/compiler_build_and_test_gpu.yml
@@ -23,8 +23,8 @@ on:
         type: string
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
+  group: compiler_build_and_test_gpu-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 env:
   DOCKER_IMAGE_TEST: ghcr.io/zama-ai/concrete-compiler
diff --git a/.github/workflows/compiler_macos_build_and_test.yml b/.github/workflows/compiler_macos_build_and_test.yml
index d3c7c46ab..e442c56a4 100644
--- a/.github/workflows/compiler_macos_build_and_test.yml
+++ b/.github/workflows/compiler_macos_build_and_test.yml
@@ -11,8 +11,8 @@ on:
         required: true
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
+  group: compiler_macos_build_and_test-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 jobs:
   BuildAndTestMacOS:
diff --git a/.github/workflows/compiler_publish_docker_images.yml b/.github/workflows/compiler_publish_docker_images.yml
index 06cf44386..4c0ce8c8f 100644
--- a/.github/workflows/compiler_publish_docker_images.yml
+++ b/.github/workflows/compiler_publish_docker_images.yml
@@ -24,7 +24,7 @@ on:
         type: string
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: compiler_publish_docker_images-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/concrete_cpu_test.yml b/.github/workflows/concrete_cpu_test.yml
index 7b7b00a2b..e39544149 100644
--- a/.github/workflows/concrete_cpu_test.yml
+++ b/.github/workflows/concrete_cpu_test.yml
@@ -5,8 +5,8 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
+  group: concrete_cpu_test-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 env:
   CARGO_TERM_COLOR: always
diff --git a/.github/workflows/concrete_cuda_test.yml b/.github/workflows/concrete_cuda_test.yml
index 3a10a3dcb..1d6c21168 100644
--- a/.github/workflows/concrete_cuda_test.yml
+++ b/.github/workflows/concrete_cuda_test.yml
@@ -46,8 +46,8 @@ jobs:
           
   run-cuda-tests-linux:
     concurrency:
-      group: ${{ github.workflow }}-${{ github.ref }}
-      cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
+      group: concrete_cuda_test-${{ github.ref }}
+      cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
     name: Test code in EC2
     needs: start-runner
     runs-on: ${{ needs.start-runner.outputs.label }}
diff --git a/.github/workflows/concrete_python_build_and_test.yml b/.github/workflows/concrete_python_build_and_test.yml
index 91d51d31a..aac5eb098 100644
--- a/.github/workflows/concrete_python_build_and_test.yml
+++ b/.github/workflows/concrete_python_build_and_test.yml
@@ -4,8 +4,8 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
+  group: concrete_python_build_and_test-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 env:
   ACTION_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 07fe274a7..4f36a7ec1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -8,8 +8,8 @@ on:
       - 'main'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
+  group: main-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 jobs:
   # This jobs outputs for each modules of our mono-repo if it changed,
diff --git a/.github/workflows/optimizer.yml b/.github/workflows/optimizer.yml
index 21800405b..5404e37bc 100644
--- a/.github/workflows/optimizer.yml
+++ b/.github/workflows/optimizer.yml
@@ -10,8 +10,8 @@ on:
         required: true
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
+  group: optimizer-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 env:
   CARGO_TERM_COLOR: always