Skip to content

chore(ci): subrepo-related cleanup #18685

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

Open
wants to merge 1 commit into
base: next
Choose a base branch
from
+8 −151
Open

chore(ci): subrepo-related cleanup #18685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .github/workflows/cancel-stale-workflows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ concurrency:

jobs:
cancel:
if: ${{ !github.event.pull_request.merged }}
Copy link
Collaborator Author

@ludamad ludamad Nov 28, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

if stuff is force-merged it's nice to clean up the tasks


permissions:
actions: write
contents: read
Expand All @@ -26,6 +24,7 @@ jobs:

steps:
- name: Cancel active PR runs for ${{ matrix.workflow_id }}
continue-on-error: true
uses: actions/github-script@5c56fde4671bc2d3592fb0f2c5b5bab9ddae03b1
with:
script: |
Expand All @@ -51,3 +50,4 @@ jobs:
});
}
}

146 changes: 0 additions & 146 deletions .github/workflows/mirror-noir-subrepo.yml
View file
Open in desktop

This file was deleted.

9 changes: 6 additions & 3 deletions .github/workflows/mirror-repos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:
schedule:
# Run the workflow every night at 2:00 AM UTC.
- cron: "0 2 * * *"
workflow_dispatch:

jobs:
mirror-to-barretenberg-repo:
Expand All @@ -18,6 +19,7 @@ jobs:
- name: Checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
with:
ref: next
fetch-depth: 0
token: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
- name: Push to barretenberg repo
Expand All @@ -27,9 +29,10 @@ jobs:
git config --global user.email [email protected]

if ./scripts/git_subrepo.sh push $SUBREPO_PATH --branch=master; then
git fetch # in case a commit came after this
git rebase origin/master
git fetch origin next
git rebase origin/next
git commit --amend -m "$(git log -1 --pretty=%B) [skip ci]"
git push
# We rely on the fixup logic instead
# git push origin next
fi

Loading