Merge pull request #237 from PowerGridModel/feature/add-merge-queue-o…

…ptions add merge queue stuff for CI
PowerGridModel · Mar 15, 2024 · 9e09c6c · 9e09c6c
2 parents 8755781 + 5337556
commit 9e09c6c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/.github/workflows/build-test-and-sonar.yml b/.github/workflows/build-test-and-sonar.yml
@@ -11,8 +11,16 @@ on:
       - main
   # run pipeline on pull request
   pull_request:
-  # Allows you to run this workflow manually from the Actions tab
+  # run pipeline on merge queue
+  merge_group:
+  # run this workflow manually from the Actions tab
   workflow_dispatch:
+    inputs:
+      create_release:
+        type: boolean
+        description: Create a (pre-)release when CI passes
+        default: true
+        required: true
 
 jobs:
 
@@ -167,14 +175,14 @@ jobs:
           path: wheelhouse/
 
       - name: Upload wheels
-        if: (github.event_name == 'push') || (github.event_name == 'workflow_dispatch')
+        if: (github.event_name == 'push') || ((github.event_name == 'workflow_dispatch') && (github.event.inputs.create_release == 'true'))
         run: |
           pip install twine
           echo "Publish to PyPI..."
           twine upload --verbose wheelhouse/*
 
       - name: Release
-        if: (github.event_name == 'push') || (github.event_name == 'workflow_dispatch')
+        if: (github.event_name == 'push') || ((github.event_name == 'workflow_dispatch') && (github.event.inputs.create_release == 'true'))
         uses: softprops/action-gh-release@v2
         with:
           files: |

diff --git a/.github/workflows/check-blocking-labels.yml b/.github/workflows/check-blocking-labels.yml
@@ -6,14 +6,17 @@
 name: Check Blocking Labels
 
 on:
-  workflow_dispatch:
+  # run pipeline on pull request
   pull_request:
-    branches:
     types:
       - opened
       - synchronize
       - labeled
       - unlabeled
+  # run pipeline on merge queue
+  merge_group:
+  # run this workflow manually from the Actions tab
+  workflow_dispatch:
 
 jobs:
   check-blocking-labels:

diff --git a/.github/workflows/check-code-quality.yml b/.github/workflows/check-code-quality.yml
@@ -11,8 +11,8 @@ on:
       - main
   # run pipeline on pull request
   pull_request:
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
+  # run pipeline on merge queue
+  merge_group:
 
 jobs:
   check-code-quality:

diff --git a/.github/workflows/reuse-compliance.yml b/.github/workflows/reuse-compliance.yml
@@ -11,6 +11,8 @@ on:
       - main
   # run pipeline on pull request
   pull_request:
+  # run pipeline on merge queue
+  merge_group:
 
 jobs:
   reuse-compliance-check: