Skip to content
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.

Sign up for GitHub

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

chore(ci): rerun ci when ready for review + don't allow draft merge #8456

Merged
merged 4 commits into from
Sep 9, 2024
Merged

chore(ci): rerun ci when ready for review + don't allow draft merge #8456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
15cf6ff
chore(ci): test draft
ludamad Sep 9, 2024
6890128
Update ci.yml
ludamad Sep 9, 2024
73578c5
Update ci.yml
ludamad Sep 9, 2024
7e3bce4
chore(ci): rerun on draft status change
ludamad Sep 9, 2024
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
13 changes: 11 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ on:
push:
branches: [master, provernet]
pull_request:
types:
- opened
- reopened
- synchronize
- ready_for_review
branches-ignore: [devnet]
workflow_dispatch:
inputs: {}
Expand Down Expand Up @@ -705,9 +710,10 @@ jobs:
- boxes
- boxes-test
# - protocol-circuits-gates-report # non-blocking
if: github.event.pull_request.draft == false && always()
if: always()
steps:
- name: Report overall success
- name: Report overall success (non-draft)
if: github.event.pull_request.draft == false
env:
# We treat any skipped or failing jobs as a failure for the workflow as a whole.
FAIL: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}
Expand All @@ -719,6 +725,9 @@ jobs:
echo "All jobs succeeded, merge allowed."
exit 0
fi
- name: Block merge (draft)
if: github.event.pull_request.draft
run: echo "Can't merge drafts." && exit 1

rerun-check:
runs-on: ubuntu-20.04
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ Recovering if the sync is not happening with basic pull commands:

- manually editing the commit variable in noir/noir-repo/.gitrepo:
this needs to exist in the branch we push to, and have the same content as our base. This is similar to submodules, except instead of pointing to the final state of the module, it points to the last commit we have sync'd from, for purposes of commit replay. This can be fixed to match the commit in master after merges.
- manually editing the parent variable in noir/noir-repo/.gitrepo: this is the parent of the last sync commit on aztec side. If you get errors with a commit not being found in the upstream repo, and the commit mentioned is not the commit variable above, it might indicate this is somehow incorrect. This can happen when commit content is ported without its history, e.g. squashes
- manually editing the parent variable in noir/noir-repo/.gitrepo: this is the parent of the last sync commit on aztec side. If you get errors with a commit not being found in the upstream repo, and the commit mentioned is not the commit variable above, it might indicate this is somehow incorrect. This can happen when commit content is ported without its history, e.g. squashes.
- use pull --force ONLY where you would use git reset. That is, if you really want to match some upstream noir for a purpose its fine, but you'll lose local changes (if any)

## Earthly
Expand Down
Loading