Skip to content

Commit

Permalink
Merge pull request #20058 from MrKevinWeiss/pr/makeeverythingrequired
Browse files Browse the repository at this point in the history
.github/workflows/*: Allow merge_groups and prs to be required
  • Loading branch information
MrKevinWeiss authored Nov 8, 2023
2 parents c0dbc03 + e7cd9ef commit cd97805
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 1 deletion.
9 changes: 9 additions & 0 deletions .github/workflows/check-commits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ name: check-commits
on:
pull_request:
types: [opened, reopened, synchronize]
merge_group:

jobs:
check-commits:
runs-on: ubuntu-latest
Expand All @@ -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
3 changes: 3 additions & 0 deletions .github/workflows/check-labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/static-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ on:
pull_request:
branches:
- '*'
merge_group:

jobs:
static-tests:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/tools-buildtest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ on:
pull_request:
branches:
- '*'
merge_group:

jobs:
tools-build:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/tools-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .murdock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

# uncomment and change this to limit builds, e.g.,
#export BOARDS="samr21-xpro native"
export BOARDS="samr21-xpro native"
# and / or
#export APPS="examples/hello-world tests/unittests"

Expand Down

0 comments on commit cd97805

Please sign in to comment.