Skip to content

Commit ef87126

Browse files
authored
chore(ci): subrepo-related cleanup (#18685)
Remove unused workflow. try to revive barretenberg repo mirroring. tweak stale workflow cleanup
2 parents b0f3eed + c29d3b4 commit ef87126

File tree

3 files changed

+8
-151
lines changed

3 files changed

+8
-151
lines changed

.github/workflows/cancel-stale-workflows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ concurrency:
1010

1111
jobs:
1212
cancel:
13-
if: ${{ !github.event.pull_request.merged }}
14-
1513
permissions:
1614
actions: write
1715
contents: read
@@ -26,6 +24,7 @@ jobs:
2624

2725
steps:
2826
- name: Cancel active PR runs for ${{ matrix.workflow_id }}
27+
continue-on-error: true
2928
uses: actions/github-script@5c56fde4671bc2d3592fb0f2c5b5bab9ddae03b1
3029
with:
3130
script: |
@@ -51,3 +50,4 @@ jobs:
5150
});
5251
}
5352
}
53+

.github/workflows/mirror-noir-subrepo.yml

Lines changed: 0 additions & 146 deletions
This file was deleted.

.github/workflows/mirror-repos.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
schedule:
1111
# Run the workflow every night at 2:00 AM UTC.
1212
- cron: "0 2 * * *"
13+
workflow_dispatch:
1314

1415
jobs:
1516
mirror-to-barretenberg-repo:
@@ -18,6 +19,7 @@ jobs:
1819
- name: Checkout
1920
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
2021
with:
22+
ref: next
2123
fetch-depth: 0
2224
token: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
2325
- name: Push to barretenberg repo
@@ -27,9 +29,10 @@ jobs:
2729
git config --global user.email [email protected]
2830
2931
if ./scripts/git_subrepo.sh push $SUBREPO_PATH --branch=master; then
30-
git fetch # in case a commit came after this
31-
git rebase origin/master
32+
git fetch origin next
33+
git rebase origin/next
3234
git commit --amend -m "$(git log -1 --pretty=%B) [skip ci]"
33-
git push
35+
# We rely on the fixup logic instead
36+
# git push origin next
3437
fi
3538

0 commit comments

Comments
 (0)