Skip to content

Commit 49b910d

Browse files
authored
Merge pull request #524 from KevFan/merge_queue
ci: enable merge_group
2 parents 879d8a5 + ffd70cf commit 49b910d

File tree

2 files changed

+29
-0
lines changed

2 files changed

+29
-0
lines changed

.github/workflows/code-style.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ on:
2121
pull_request:
2222
branches: [ 'main', 'master', 'release-*' ]
2323

24+
merge_group:
25+
types: [ checks_requested ]
26+
2427
jobs:
2528

2629
autoformat:
@@ -236,3 +239,15 @@ jobs:
236239
-fail-on-error="true" \
237240
-level="error"
238241
echo '::endgroup::'
242+
243+
required-checks:
244+
name: Code Style Required Checks
245+
# This check adds a list of checks to one job to simplify adding settings to the repo.
246+
# If a new check is added in this file, and it should be retested on entry to the merge queue,
247+
# it needs to be added to the list below aka needs: [ existing check 1, existing check 2, new check ].
248+
needs: [ lint, autoformat ]
249+
if: always()
250+
runs-on: ubuntu-latest
251+
steps:
252+
- uses: actions/checkout@v4
253+
- run: echo '${{ toJSON(needs) }}' | jq -e 'all(.[]; .result == "success" or .result == "skipped")'

.github/workflows/go-test.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ on:
77
pull_request:
88
branches: [ 'main', 'master' ]
99

10+
merge_group:
11+
types: [ checks_requested ]
12+
1013
jobs:
1114
unit-tests:
1215
name: Unit Tests
@@ -32,3 +35,14 @@ jobs:
3235
- name: Run test benchmarks
3336
run: |
3437
make benchmarks
38+
required-checks:
39+
name: Test Required Checks
40+
# This check adds a list of checks to one job to simplify adding settings to the repo.
41+
# If a new check is added in this file, and it should be retested on entry to the merge queue,
42+
# it needs to be added to the list below aka needs: [ existing check 1, existing check 2, new check ].
43+
needs: [ unit-tests ]
44+
if: always()
45+
runs-on: ubuntu-latest
46+
steps:
47+
- uses: actions/checkout@v4
48+
- run: echo '${{ toJSON(needs) }}' | jq -e 'all(.[]; .result == "success" or .result == "skipped")'

0 commit comments

Comments
 (0)