-
Notifications
You must be signed in to change notification settings - Fork 316
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: Pw/update merge check #6201
Merged
Merged
Changes from 7 commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
0e5337c
Update merge check
PhilWindle 0c5be97
Fixed formatting
PhilWindle 18bef81
Update
PhilWindle 4cf4030
Another approach
PhilWindle 5345711
Another attempt
PhilWindle 14a1311
Update
PhilWindle b6489d9
Merge branch 'master' into pw/update-merge-check
PhilWindle f52601d
Fix attempt
PhilWindle ab8a257
Merge branch 'pw/update-merge-check' of github.com:AztecProtocol/azte…
PhilWindle fc055fb
Merge branch 'master' into pw/update-merge-check
PhilWindle de50701
Attempt fix
PhilWindle e6ab527
Merge branch 'master' into pw/update-merge-check
PhilWindle c9a781b
WIP
PhilWindle a9e6dda
Fix attempt
PhilWindle 2d73baa
Try logging
PhilWindle cf716ff
Another trial
PhilWindle 79ca1c1
Merge branch 'master' into pw/update-merge-check
PhilWindle cafb7a3
Fix
PhilWindle a343faa
Merge branch 'pw/update-merge-check' of github.com:AztecProtocol/azte…
PhilWindle File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
echo "At least one job failed, merging not allowed" | ||
exit 1 | ||
fi | ||
echo "Pull request merging now allowed." | ||
|
@@ -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, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm thinking whether you could just have |
||
] | ||
runs-on: ubuntu-latest | ||
if: ${{ github.ref == 'refs/heads/master' && failure() }} | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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