ci: Add missing `merge_group` trigger for workflow

Now that we're using the Github merge queue, this is required to not
let the queue hanging.

ChangeLog:

	* .github/workflows/bootstrap.yml: Add missing `merge_group` trigger.
	* .github/workflows/ccpp.yml: Likewise.
	* .github/workflows/clang-format.yml: Likewise.
	* .github/workflows/commit-format.yml: Likewise.

diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml
index b8abd896788e089bdcad86d96486aed75994b3d3..91bb66f9f6e797e4f4199077bd57e316cf2bfc09 100644 (file)
--- a/.github/workflows/bootstrap.yml
+++ b/.github/workflows/bootstrap.yml
@@ -3,6 +3,7 @@ name: GCC Bootstrap Build
 on:
   push:
     branches: [ master ]
+  merge_group:
 
 jobs:
   build:

diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 2805a73cb55ce047f3c4ac6ea49f73a789968c31..0e95c04625e4415c600ff02fb7a2b78793c2755a 100644 (file)
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -7,6 +7,7 @@ on:
       - staging
   pull_request:
     branches: [ master ]
+  merge_group:
 
 jobs:
   build-and-check-ubuntu-64bit:

diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml
index e1c81ad4f00d64c504a10b35a603c0f64fd74629..b0cb341e3027e7ebce13a6ba2d09e193e845cebe 100644 (file)
--- a/.github/workflows/clang-format.yml
+++ b/.github/workflows/clang-format.yml
@@ -7,6 +7,7 @@ on:
       - staging
   pull_request:
     branches: [ master ]
+  merge_group:
 
 jobs:
   clang-format:

diff --git a/.github/workflows/commit-format.yml b/.github/workflows/commit-format.yml
index 2e551fd1b00ce93b8fed63f812b9d448f19480d8..6ccb99bacb0399383fb857322940221afce051c1 100644 (file)
--- a/.github/workflows/commit-format.yml
+++ b/.github/workflows/commit-format.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - master
       - gcc-patch-dev
+  merge_group:
 
 jobs:
   check-commit-changelogs:
@@ -26,8 +27,10 @@ jobs:
       
       - name: GCC check PR Commits
         run: |
-          python3 contrib/gcc-changelog/git_check_commit.py origin/${{ github.event.pull_request.base.ref }}..${{ github.event.pull_request.head.sha }}
-
+          if ${{ github.event_name == 'pull_request' }}; then
+            python3 contrib/gcc-changelog/git_check_commit.py origin/${{ github.event.pull_request.base.ref }}..${{ github.event.pull_request.head.sha }}
+          fi
+            
   check-commit-prefixes:
     runs-on: ubuntu-latest
     name: check-gccrs-prefix