Skip to content
Merged
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 18 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -352,22 +352,23 @@ jobs:
merge-check:
runs-on: ubuntu-latest
needs:
- e2e
- bb-native-tests
- bb-bench
- yarn-project-formatting
- yarn-project-test
- prover-client-test
[
e2e,
bb-native-tests,
bb-bench,
yarn-project-formatting,
yarn-project-test,
prover-client-test,
bb-js-test,
barretenberg-acir-tests-bb-js,
barretenberg-acir-tests-bb,
barretenberg-acir-tests-sol,
]
if: always()
steps:
- run: |
echo "e2e status: ${{ needs.e2e.result }}"
echo "bb-native-tests status: ${{ needs.bb-native-tests.result }}"
echo "bb-bench status: ${{ needs.bb-bench.result }}"
echo "yarn-project-formatting status: ${{ needs.yarn-project-formatting.result }}"
echo "yarn-project-test status: ${{ needs.yarn-project-test.result }}"
if [[ "${{ needs.e2e.result }}" != 'success' || "${{ needs.bb-native-tests.result }}" != 'success' || "${{ needs.bb-bench.result }}" != 'success' || "${{ needs.yarn-project-formatting.result }}" != 'success' || "${{ needs.yarn-project-test.result }}" != 'success' ]]; then
echo "Pull request merging not allowed due to failures."
if [ ${{ contains(needs.*.result, 'failure') }} ]; then

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, didn't know this was possible

echo "At least one job failed, merging not allowed"
exit 1
fi
echo "Pull request merging now allowed."
Expand All @@ -381,6 +382,10 @@ jobs:
yarn-project-formatting,
yarn-project-test,
prover-client-test,
bb-js-test,
barretenberg-acir-tests-bb-js,
barretenberg-acir-tests-bb,
barretenberg-acir-tests-sol,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm thinking whether you could just have notify depend on merge-check so we don't have to duplicate this list

]
runs-on: ubuntu-latest
if: ${{ github.ref == 'refs/heads/master' && failure() }}
Expand Down