ci: fix job are cancelling each other (#6781)

diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
index 7587966320c81d212324abd55cf77ae7103466c0..d50af0b70e17cae090519a0194149e0c9ecd89a3 100644 (file)
--- a/.github/workflows/bench.yml
+++ b/.github/workflows/bench.yml
@@ -32,7 +32,7 @@ on:
     -  cron: '04 2 * * *'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}-${{ github.event.inputs.sha }}
+  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}-${{ github.event.inputs.sha }}
   cancel-in-progress: true
 
 jobs:

diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml
index 521cc29aea976ac37db9066c0bf005aafe8431cc..3e68a3c8c433f76e4a73426089005d9f55f8da4c 100644 (file)
--- a/.github/workflows/server.yml
+++ b/.github/workflows/server.yml
@@ -23,7 +23,7 @@ on:
     -  cron: '2 4 * * *'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
   cancel-in-progress: true
 
 jobs: