diff options
| author | Arthur Cohen <arthur.cohen@embecosm.com> | 2023-02-14 16:02:51 +0100 |
|---|---|---|
| committer | CohenArthur <arthur.cohen@embecosm.com> | 2023-02-14 18:52:09 +0000 |
| commit | e07ef308523105b8f407d4b66dbc7c34155cf753 (patch) | |
| tree | cfbc71a85a4a389e77c75f44fc0ae7faeb6b536c | |
| parent | 2006ca18fed788182e9111aaec13a32e4db040a1 (diff) | |
| download | gcc-e07ef308523105b8f407d4b66dbc7c34155cf753.zip gcc-e07ef308523105b8f407d4b66dbc7c34155cf753.tar.gz gcc-e07ef308523105b8f407d4b66dbc7c34155cf753.tar.bz2 | |
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.
| -rw-r--r-- | .github/workflows/bootstrap.yml | 1 | ||||
| -rw-r--r-- | .github/workflows/ccpp.yml | 1 | ||||
| -rw-r--r-- | .github/workflows/clang-format.yml | 1 | ||||
| -rw-r--r-- | .github/workflows/commit-format.yml | 7 |
4 files changed, 8 insertions, 2 deletions
diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml index b8abd89..91bb66f 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 2805a73..0e95c04 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 e1c81ad..b0cb341 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 2e551fd..6ccb99b 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 |