From: Arthur Cohen <arthur.cohen@embecosm.com>
Date: Tue, 14 Feb 2023 15:02:51 +0000 (+0100)
Subject: ci: Add missing `merge_group` trigger for workflow
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e07ef308523105b8f407d4b66dbc7c34155cf753;p=thirdparty%2Fgcc.git

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 b8abd896788e..91bb66f9f6e7 100644
--- 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 2805a73cb55c..0e95c04625e4 100644
--- 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 e1c81ad4f00d..b0cb341e3027 100644
--- 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 2e551fd1b00c..6ccb99bacb03 100644
--- 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