attempt to fix nightly again

Signed-off-by: Martijn Govers <Martijn.Govers@Alliander.com>
PowerGridModel · Sep 26, 2024 · 0f8005c · 0f8005c
1 parent 27f53d5
commit 0f8005c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 25 deletions.
diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml
@@ -20,11 +20,6 @@ on:
         type: string
         description: "The CMake target to run (e.g.: all)"
         required: true
-      cancel_in_progress:
-        type: boolean
-        description: Cancel this action if a newer one is kicked off
-        default: false  # by default, don't cancel in progress
-        required: false
   # run this workflow manually from the Actions tab
   workflow_dispatch:
     inputs:
@@ -38,15 +33,10 @@ on:
           - power_grid_model_api_tests
           - all power_grid_model_benchmark_cpp
         required: true
-      cancel_in_progress:
-        type: boolean
-        description: Cancel this action if a newer one is kicked off
-        default: true
-        required: false
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ inputs.cancel_in_progress != 'false' }}
+  cancel-in-progress: true
 
 jobs:
   clang-tidy:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -22,11 +22,6 @@ on:
         description: Create a (pre-)release when CI passes
         default: false
         required: false
-      cancel_in_progress:
-        type: boolean
-        description: Cancel this action if a newer one is kicked off
-        default: false  # by default, don't cancel in progress
-        required: false
   # run this workflow manually from the Actions tab
   workflow_dispatch:
     inputs:
@@ -35,15 +30,10 @@ on:
         description: Create a (pre-)release when CI passes
         default: false
         required: true
-      cancel_in_progress:
-        type: boolean
-        description: Cancel this action if a newer one is kicked off
-        default: true
-        required: false
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ inputs.cancel_in_progress != 'false' }}
+  cancel-in-progress: true
 
 
 jobs:

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -11,7 +11,7 @@ on:
     - cron: "0 2 * * *" # Based on UTC time
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref }}-root
   cancel-in-progress: true
 
 jobs:
@@ -21,11 +21,9 @@ jobs:
       contents: write
     with:
       create_release: false
-      cancel_in_progress: false
 
   clang-tidy:
     uses: "./.github/workflows/clang-tidy.yml"
     with:
       target: power_grid_model_c
       #   target: "all power_grid_model_benchmark_cpp"  # TODO(mgovers): re-enable when more clang-tidy stuff is fixed
-      cancel_in_progress: false