Skip to content

Commit fcf9995

Browse files
authored
chore: fix matrix build results are not actually checked (#4715)
The matrix build check was just wrong. Now use one we know is working. --- By submitting this pull request, I confirm that my contribution is made under the terms of the [Apache 2.0 license]. [Apache 2.0 license]: https://www.apache.org/licenses/LICENSE-2.0
1 parent 64e0d83 commit fcf9995

File tree

2 files changed

+21
-8
lines changed

2 files changed

+21
-8
lines changed

.github/workflows/main.yml

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -370,11 +370,15 @@ jobs:
370370
test-ok:
371371
name: Unit Tests
372372
runs-on: ubuntu-latest
373-
needs: test
373+
needs:
374+
- test
375+
if: always()
374376
steps:
375-
- name: OK
376-
# This is just a join target to simplify branch protection setup
377-
run: echo OK
377+
- name: Build result
378+
run: echo ${{ needs.test.result }}
379+
- if: ${{ needs.test.result != 'success' }}
380+
name: Set status based on matrix build
381+
run: exit 1
378382

379383
pacmak-integration-test:
380384
runs-on: ubuntu-latest
@@ -450,8 +454,12 @@ jobs:
450454
pacmak-integration-test-ok:
451455
name: Integration test (jsii-pacmak)
452456
runs-on: ubuntu-latest
453-
needs: pacmak-integration-test
457+
needs:
458+
- pacmak-integration-test
459+
if: always()
454460
steps:
455-
- name: OK
456-
# This is just a join target to simplify branch protection setup
457-
run: echo OK
461+
- name: Build result
462+
run: echo ${{ needs.pacmak-integration-test.result }}
463+
- if: ${{ needs.pacmak-integration-test.result != 'success' }}
464+
name: Set status based on matrix build
465+
run: exit 1

.mergify/config.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ queue_rules:
33
- name: default-squash
44
conditions:
55
- status-success=Unit Tests
6+
- status-success=Integration test (jsii-pacmak)
67
commit_message_template: |-
78
{{ title }} (#{{ number }})
89
@@ -12,6 +13,7 @@ queue_rules:
1213
- name: default-merge
1314
conditions:
1415
- status-success=Unit Tests
16+
- status-success=Integration test (jsii-pacmak)
1517
commit_message_template: |-
1618
{{ title }} (#{{ number }})
1719
@@ -46,6 +48,7 @@ pull_request_rules:
4648
- '#changes-requested-reviews-by=0'
4749
- status-success=Validate PR Title
4850
- status-success=Unit Tests
51+
- status-success=Integration test (jsii-pacmak)
4952

5053
- name: Synchronize that PR to upstream and merge it (squash)
5154
actions:
@@ -70,6 +73,7 @@ pull_request_rules:
7073
- '#changes-requested-reviews-by=0'
7174
- status-success=Validate PR Title
7275
- status-success=Unit Tests
76+
- status-success=Integration test (jsii-pacmak)
7377

7478
- name: Synchronize that PR to upstream and merge it (no-squash)
7579
actions:
@@ -94,6 +98,7 @@ pull_request_rules:
9498
- '#changes-requested-reviews-by=0'
9599
- status-success=Validate PR Title
96100
- status-success=Unit Tests
101+
- status-success=Integration test (jsii-pacmak)
97102

98103
- name: Clean branch up
99104
actions:

0 commit comments

Comments
 (0)