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.

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: consolidate mirror repos yml #1994

Merged
merged 25 commits into from
Sep 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
21cb22b
git subrepo pull --force circuits/cpp/barretenberg
ludamad Sep 4, 2023
10772d3
Fix bb
ludamad Sep 4, 2023
f7c290f
Merge branch 'master' of https://github.com/AztecProtocol/aztec3-pack…
ludamad Sep 4, 2023
b00790b
fix master
ludamad Sep 4, 2023
2a620a2
Merge branch 'fix/bump-bb' into ad/fix-ci
ludamad Sep 4, 2023
cbe0b56
fix e2e sandbox test
ludamad Sep 4, 2023
470c791
Add sooner logins
ludamad Sep 4, 2023
b168b1f
Rebuild patterns. Try it all and see if we hit intermittent issues
ludamad Sep 4, 2023
91df510
Rebuild patterns. Try it all and see if we hit intermittent issues
ludamad Sep 4, 2023
7a2c5ac
Revert check_rebuild. Add comment
ludamad Sep 4, 2023
74ef7ee
Try C++ change.
ludamad Sep 4, 2023
aaa0a0b
Consolidate workflows in mirror
ludamad Sep 5, 2023
7cedc5d
Revert
ludamad Sep 5, 2023
c92fb42
Merge remote-tracking branch 'origin/master' into ad/consolidate-mirr…
ludamad Sep 5, 2023
33ad7bb
Delete other workflows
ludamad Sep 5, 2023
cd747c2
Consolidate workflows
ludamad Sep 5, 2023
c05c354
Merge branch 'master' into ad/consolidate-mirror-repos.yml
ludamad Sep 11, 2023
8dec508
feat: update script to run at night time utc (only if the repo has ch…
Maddiaa0 Sep 13, 2023
81d308c
Merge branch 'master' into ad/consolidate-mirror-repos.yml
Maddiaa0 Sep 13, 2023
abcde16
fix: remove verbose change check, it was already implied
Maddiaa0 Sep 13, 2023
0f0c227
Merge branch 'master' into ad/consolidate-mirror-repos.yml
Maddiaa0 Sep 13, 2023
7315704
fix: update bb path
Maddiaa0 Sep 13, 2023
0266660
fix: merge issue
Maddiaa0 Sep 13, 2023
83ba9f4
fix: adams suggestions
Maddiaa0 Sep 13, 2023
7f982c0
Merge branch 'master' into ad/consolidate-mirror-repos.yml
ludamad Sep 13, 2023
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
35 changes: 0 additions & 35 deletions .github/workflows/mirror_barretenberg_repo.yml

This file was deleted.

35 changes: 0 additions & 35 deletions .github/workflows/mirror_build_system_repo.yml

This file was deleted.

35 changes: 0 additions & 35 deletions .github/workflows/mirror_docs_repo.yml

This file was deleted.

79 changes: 79 additions & 0 deletions .github/workflows/mirror_repos.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
# We push using git subrepo (https://github.com/ingydotnet/git-subrepo)
# with some logic to recover from squashed parent commits
# We first identify ourselves, needed to commit.
# Then push to subrepo, commit to master. The commit is needed
# to continue to replay. If we still hit issues such as this
# action failing due to upstream changes, a manual resolution
# PR with ./scripts/git_subrepo.sh pull will be needed.
name: Mirror Repositories

concurrency:
group: mirror-repositories
on:
schedule:
# Run the workflow every night at 2:00 AM UTC.
cron: '0 2 * * *'

jobs:
mirror-to-docs-repo:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0
token: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
- name: Push to docs repo
run: |
SUBREPO_PATH=docs
git config --global user.name AztecBot
git config --global user.email tech@aztecprotocol.com

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

mirror-to-build-system-repo:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0
token: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
- name: Push to build-system repo
run: |
SUBREPO_PATH=build-system
git config --global user.name AztecBot
git config --global user.email tech@aztecprotocol.com

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

mirror-to-barretenberg-repo:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0
token: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
- name: Push to barretenberg repo
run: |
SUBREPO_PATH=barretenberg
git config --global user.name AztecBot
git config --global user.email tech@aztecprotocol.com

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