diff --git a/.github/workflows/mirror_repos.yml b/.github/workflows/mirror_repos.yml index 7712b17ec3c3..ea5e694ca2a5 100644 --- a/.github/workflows/mirror_repos.yml +++ b/.github/workflows/mirror_repos.yml @@ -6,9 +6,6 @@ # 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. @@ -38,6 +35,8 @@ jobs: mirror-to-build-system-repo: runs-on: ubuntu-latest + # Force sequential. + needs: mirror-to-docs-repo steps: - name: Checkout uses: actions/checkout@v3 @@ -59,6 +58,8 @@ jobs: mirror-to-barretenberg-repo: runs-on: ubuntu-latest + # Force sequential. + needs: mirror-to-build-system-repo steps: - name: Checkout uses: actions/checkout@v3 @@ -80,6 +81,8 @@ jobs: mirror-to-aztec-nr-repo: runs-on: ubuntu-latest + # Force sequential. + needs: mirror-to-barretenberg-repo steps: - name: Checkout uses: actions/checkout@v3 @@ -97,4 +100,4 @@ jobs: git rebase origin/master git commit --amend -m "$(git log -1 --pretty=%B) [skip ci]" git push - fi \ No newline at end of file + fi diff --git a/barretenberg/.gitrepo b/barretenberg/.gitrepo index 875ba73837d4..76607ccb079f 100644 --- a/barretenberg/.gitrepo +++ b/barretenberg/.gitrepo @@ -5,8 +5,8 @@ ; [subrepo] remote = https://github.com/AztecProtocol/barretenberg - branch = main - commit = ae9f99c3caf0213882d843577374b03871cc7092 - parent = c8a5cfb375b498475503c12cc83fcdba39f2ec5f + branch = master + commit = 16c9bec3e171dd4704ba641735a28f0bf340d564 + parent = b62c4de76264a4fa214c4a61841ef7199f970fde method = merge cmdver = 0.4.6 diff --git a/build-system/.gitrepo b/build-system/.gitrepo index 2403ed1ab143..28aebd541f1c 100644 --- a/build-system/.gitrepo +++ b/build-system/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/AztecProtocol/build-system branch = master - commit = 138c4eab1574d71c26f386a866f453a540802a06 - parent = 1368b55d0a9bc9ea61e29bb095ca62aa6902645f + commit = 28dbd553e75d68b74dec3c3749cefefe3f600028 + parent = 5f158708d7a667769c3d318c652f37260b59ba0a method = merge cmdver = 0.4.6 diff --git a/docs/.gitrepo b/docs/.gitrepo index 3530bc59b57c..40c372b5f99a 100644 --- a/docs/.gitrepo +++ b/docs/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/AztecProtocol/docs branch = main - commit = 20fe6bd3ec37c32516ddd799918f5f268279b506 - parent = bf2651e714e148cdd0a625a435fe1ee64d762ffb + commit = 4e06fd2d8b43cca83eae9fb04947131e8e5ad091 + parent = 6223a94d09b7aa1cce23ea13b589495e15830540 method = merge cmdver = 0.4.6