From ef40feec9e9e66ac8a2b03a89997c5b9d97562fd Mon Sep 17 00:00:00 2001 From: MrKevinWeiss Date: Wed, 8 Nov 2023 11:31:07 +0100 Subject: [PATCH] .github/workflows/*: Allow merge_groups and prs to be required (cherry picked from commit d41e368bf7895785ce748c4e940103fd7922f4c5) --- .github/workflows/check-commits.yml | 9 +++++++++ .github/workflows/check-labels.yml | 3 +++ .github/workflows/labeler.yml | 2 ++ .github/workflows/static-test.yml | 1 + .github/workflows/tools-buildtest.yml | 1 + .github/workflows/tools-test.yml | 2 ++ 6 files changed, 18 insertions(+) diff --git a/.github/workflows/check-commits.yml b/.github/workflows/check-commits.yml index d294f3783648..c4d15bacf70a 100644 --- a/.github/workflows/check-commits.yml +++ b/.github/workflows/check-commits.yml @@ -2,6 +2,8 @@ name: check-commits on: pull_request: types: [opened, reopened, synchronize] + merge_group: + jobs: check-commits: runs-on: ubuntu-latest @@ -24,3 +26,10 @@ jobs: - name: Run checks run: | ./dist/tools/${{ matrix.check }}/check.sh "${{ github.base_ref }}" + check-commits-success: + needs: check-commits + if: github.event_name != 'merge_group' + runs-on: ubuntu-latest + steps: + - name: check-commits succeeded + run: exit 0 diff --git a/.github/workflows/check-labels.yml b/.github/workflows/check-labels.yml index 0639b4c97c5f..167ab44c583e 100644 --- a/.github/workflows/check-labels.yml +++ b/.github/workflows/check-labels.yml @@ -4,8 +4,11 @@ on: types: [opened, reopened, labeled, unlabeled, synchronize] pull_request_review: types: [submitted, dismissed] + merge_group: + jobs: check-labels: + if: github.event_name != 'merge_group' runs-on: ubuntu-latest steps: - uses: RIOT-OS/check-labels-action@v1.1.1 diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 052328779520..7b4efd24fd03 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -3,10 +3,12 @@ name: pr-labeler on: pull_request_target: types: [opened, synchronize, reopened] + merge_group: jobs: triage: runs-on: ubuntu-latest + if: github.event_name != 'merge_group' steps: - uses: actions/labeler@main with: diff --git a/.github/workflows/static-test.yml b/.github/workflows/static-test.yml index 81b2a517860e..c9f10c6fa89d 100644 --- a/.github/workflows/static-test.yml +++ b/.github/workflows/static-test.yml @@ -13,6 +13,7 @@ on: pull_request: branches: - '*' + merge_group: jobs: static-tests: diff --git a/.github/workflows/tools-buildtest.yml b/.github/workflows/tools-buildtest.yml index 35bc9e8dded2..d16a3481a2d8 100644 --- a/.github/workflows/tools-buildtest.yml +++ b/.github/workflows/tools-buildtest.yml @@ -11,6 +11,7 @@ on: pull_request: branches: - '*' + merge_group: jobs: tools-build: diff --git a/.github/workflows/tools-test.yml b/.github/workflows/tools-test.yml index 8f6226de8136..5d5f4fe82c37 100644 --- a/.github/workflows/tools-test.yml +++ b/.github/workflows/tools-test.yml @@ -9,9 +9,11 @@ on: pull_request: branches: - '*' + merge_group: jobs: python-tests: + if: github.event_name != 'merge_group' runs-on: ubuntu-latest steps: - uses: actions/checkout@main