Skip to content

Commit 146330d

Browse files
authored
Merge pull request #114 from Kuadrant/merge-queue
🔀 merge queue onboarding
2 parents 0717a99 + 5d16867 commit 146330d

File tree

3 files changed

+56
-7
lines changed

3 files changed

+56
-7
lines changed

.github/workflows/code-style.yaml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
---
22
name: Code Style
33

4-
on: pull_request
4+
on:
5+
pull_request: {}
6+
7+
merge_group:
8+
types: [checks_requested]
59

610
jobs:
711
lint:
@@ -21,3 +25,15 @@ jobs:
2125
- name: run lint test
2226
run: |
2327
make run-lint
28+
required-checks:
29+
name: Code Style Required Checks
30+
# This check adds a list of checks to one job to simplify adding settings to the repo.
31+
# If a new check is added in this file, and it should be retested on entry to the merge queue,
32+
# it needs to be added to the list below aka needs: [ existing check 1, existing check 2, new check ].
33+
needs:
34+
- lint
35+
if: always()
36+
runs-on: ubuntu-latest
37+
steps:
38+
- uses: actions/checkout@v4
39+
- run: echo '${{ toJSON(needs) }}' | jq -e 'all(.[]; .result == "success" or .result == "skipped")'

.github/workflows/commands.yaml

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@ name: Command Testing
33

44
on:
55
push:
6-
branches: [ 'main' ]
6+
branches: ['main']
77

88
pull_request:
9-
branches: [ '*' ]
9+
branches: ['*']
10+
11+
merge_group:
12+
types: [checks_requested]
1013

1114
jobs:
12-
install:
13-
name: Run kuadrantctl generate
15+
generate-httproute:
16+
name: Run kuadrantctl generate gatewayapi httproute
1417
runs-on: ubuntu-latest
1518
env:
1619
KIND_CLUSTER_NAME: kuadrantctl-local
@@ -28,3 +31,16 @@ jobs:
2831
- name: run command
2932
run: |
3033
bin/kuadrantctl generate gatewayapi httproute --oas examples/oas3/gateway-api-petstore.yaml
34+
35+
required-checks:
36+
name: Command Testing Required Checks
37+
# This check adds a list of checks to one job to simplify adding settings to the repo.
38+
# If a new check is added in this file, and it should be retested on entry to the merge queue,
39+
# it needs to be added to the list below aka needs: [ existing check 1, existing check 2, new check ].
40+
needs:
41+
- generate-httproute
42+
if: always()
43+
runs-on: ubuntu-latest
44+
steps:
45+
- uses: actions/checkout@v4
46+
- run: echo '${{ toJSON(needs) }}' | jq -e 'all(.[]; .result == "success" or .result == "skipped")'

.github/workflows/testing.yaml

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@ name: Testing
33

44
on:
55
push:
6-
branches: [ 'main' ]
6+
branches: ['main']
7+
8+
merge_group:
9+
types: [checks_requested]
710

811
pull_request:
9-
branches: [ '*' ]
12+
branches: ['*']
1013

1114
jobs:
1215
build:
@@ -50,3 +53,17 @@ jobs:
5053
token: ${{ secrets.CODECOV_TOKEN }}
5154
fail_ci_if_error: false
5255
verbose: true
56+
57+
required-checks:
58+
name: Testing Required Checks
59+
# This check adds a list of checks to one job to simplify adding settings to the repo.
60+
# If a new check is added in this file, and it should be retested on entry to the merge queue,
61+
# it needs to be added to the list below aka needs: [ existing check 1, existing check 2, new check ].
62+
needs:
63+
- build
64+
- tests
65+
if: always()
66+
runs-on: ubuntu-latest
67+
steps:
68+
- uses: actions/checkout@v4
69+
- run: echo '${{ toJSON(needs) }}' | jq -e 'all(.[]; .result == "success" or .result == "skipped")'

0 commit comments

Comments
 (0)