Skip to content

Commit

Permalink
chore: fix matrix build results are not actually checked (#4715)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
mrgrain authored Nov 27, 2024
1 parent 64e0d83 commit fcf9995
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 8 deletions.
24 changes: 16 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -370,11 +370,15 @@ jobs:
test-ok:
name: Unit Tests
runs-on: ubuntu-latest
needs: test
needs:
- test
if: always()
steps:
- name: OK
# This is just a join target to simplify branch protection setup
run: echo OK
- name: Build result
run: echo ${{ needs.test.result }}
- if: ${{ needs.test.result != 'success' }}
name: Set status based on matrix build
run: exit 1

pacmak-integration-test:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -450,8 +454,12 @@ jobs:
pacmak-integration-test-ok:
name: Integration test (jsii-pacmak)
runs-on: ubuntu-latest
needs: pacmak-integration-test
needs:
- pacmak-integration-test
if: always()
steps:
- name: OK
# This is just a join target to simplify branch protection setup
run: echo OK
- name: Build result
run: echo ${{ needs.pacmak-integration-test.result }}
- if: ${{ needs.pacmak-integration-test.result != 'success' }}
name: Set status based on matrix build
run: exit 1
5 changes: 5 additions & 0 deletions .mergify/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ queue_rules:
- name: default-squash
conditions:
- status-success=Unit Tests
- status-success=Integration test (jsii-pacmak)
commit_message_template: |-
{{ title }} (#{{ number }})
Expand All @@ -12,6 +13,7 @@ queue_rules:
- name: default-merge
conditions:
- status-success=Unit Tests
- status-success=Integration test (jsii-pacmak)
commit_message_template: |-
{{ title }} (#{{ number }})
Expand Down Expand Up @@ -46,6 +48,7 @@ pull_request_rules:
- '#changes-requested-reviews-by=0'
- status-success=Validate PR Title
- status-success=Unit Tests
- status-success=Integration test (jsii-pacmak)

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

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

- name: Clean branch up
actions:
Expand Down

0 comments on commit fcf9995

Please sign in to comment.