From 5f158708d7a667769c3d318c652f37260b59ba0a Mon Sep 17 00:00:00 2001 From: ludamad Date: Tue, 26 Sep 2023 10:29:50 +0100 Subject: [PATCH 01/10] fix: .gitrepo files after bad pushes --- barretenberg/.gitrepo | 4 ++-- build-system/.gitrepo | 4 ++-- docs/.gitrepo | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/barretenberg/.gitrepo b/barretenberg/.gitrepo index 875ba73837d4..2a3e07ad5948 100644 --- a/barretenberg/.gitrepo +++ b/barretenberg/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/AztecProtocol/barretenberg branch = main - commit = ae9f99c3caf0213882d843577374b03871cc7092 - parent = c8a5cfb375b498475503c12cc83fcdba39f2ec5f + commit = 7edb1644d0ae472a70fc3554b7d2cfc6c5496168 + parent = 9f1a3a5e4b72506489645f8be8c8aa5129a2e179 method = merge cmdver = 0.4.6 diff --git a/build-system/.gitrepo b/build-system/.gitrepo index 2403ed1ab143..c80044ea677f 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 = c57b25101e8f0f73533a62cf8f1b4e4b9739d1ea + parent = 5308c21d4dc225233af8ae584c471e7bed5d9381 method = merge cmdver = 0.4.6 diff --git a/docs/.gitrepo b/docs/.gitrepo index 3530bc59b57c..c403b05dd29f 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 = 7198cb9deea0635a4dc769b7eeb8cd29ed57e6d3 + parent = 0c3a6271a1d90fa95a0163606e49f432573e66da method = merge cmdver = 0.4.6 From 6223a94d09b7aa1cce23ea13b589495e15830540 Mon Sep 17 00:00:00 2001 From: ludamad Date: Tue, 26 Sep 2023 10:30:08 +0100 Subject: [PATCH 02/10] git subrepo push build-system subrepo: subdir: "build-system" merged: "28dbd553e7" upstream: origin: "https://github.com/AztecProtocol/build-system" branch: "master" commit: "28dbd553e7" git-subrepo: version: "0.4.6" origin: "???" commit: "???" --- build-system/.gitrepo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-system/.gitrepo b/build-system/.gitrepo index c80044ea677f..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 = c57b25101e8f0f73533a62cf8f1b4e4b9739d1ea - parent = 5308c21d4dc225233af8ae584c471e7bed5d9381 + commit = 28dbd553e75d68b74dec3c3749cefefe3f600028 + parent = 5f158708d7a667769c3d318c652f37260b59ba0a method = merge cmdver = 0.4.6 From 5d020dce64ba67b9f11221ec92d36eecf0510c34 Mon Sep 17 00:00:00 2001 From: ludamad Date: Tue, 26 Sep 2023 10:32:33 +0100 Subject: [PATCH 03/10] git subrepo push docs subrepo: subdir: "docs" merged: "4e06fd2d8b" upstream: origin: "https://github.com/AztecProtocol/docs" branch: "main" commit: "4e06fd2d8b" git-subrepo: version: "0.4.6" origin: "???" commit: "???" --- docs/.gitrepo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/.gitrepo b/docs/.gitrepo index c403b05dd29f..40c372b5f99a 100644 --- a/docs/.gitrepo +++ b/docs/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/AztecProtocol/docs branch = main - commit = 7198cb9deea0635a4dc769b7eeb8cd29ed57e6d3 - parent = 0c3a6271a1d90fa95a0163606e49f432573e66da + commit = 4e06fd2d8b43cca83eae9fb04947131e8e5ad091 + parent = 6223a94d09b7aa1cce23ea13b589495e15830540 method = merge cmdver = 0.4.6 From 8cbf2889e18a203261a0da549e0b5e3a1a0d483d Mon Sep 17 00:00:00 2001 From: ludamad Date: Tue, 26 Sep 2023 10:40:03 +0100 Subject: [PATCH 04/10] fix: workflow order --- .github/workflows/mirror_repos.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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 From b62c4de76264a4fa214c4a61841ef7199f970fde Mon Sep 17 00:00:00 2001 From: ludamad Date: Tue, 26 Sep 2023 10:57:41 +0100 Subject: [PATCH 05/10] chore: force sync barretenberg From 008e20cdcf84466c03304275b52d5261762b6bbf Mon Sep 17 00:00:00 2001 From: ludamad Date: Tue, 26 Sep 2023 10:57:47 +0100 Subject: [PATCH 06/10] git subrepo push --branch=master barretenberg subrepo: subdir: "barretenberg" merged: "16c9bec3e" upstream: origin: "https://github.com/AztecProtocol/barretenberg" branch: "master" commit: "16c9bec3e" git-subrepo: version: "0.4.6" origin: "???" commit: "???" --- barretenberg/.gitrepo | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/barretenberg/.gitrepo b/barretenberg/.gitrepo index 2a3e07ad5948..76607ccb079f 100644 --- a/barretenberg/.gitrepo +++ b/barretenberg/.gitrepo @@ -5,8 +5,8 @@ ; [subrepo] remote = https://github.com/AztecProtocol/barretenberg - branch = main - commit = 7edb1644d0ae472a70fc3554b7d2cfc6c5496168 - parent = 9f1a3a5e4b72506489645f8be8c8aa5129a2e179 + branch = master + commit = 16c9bec3e171dd4704ba641735a28f0bf340d564 + parent = b62c4de76264a4fa214c4a61841ef7199f970fde method = merge cmdver = 0.4.6 From 78be1e7b9e01ace56bfdeef2736f498336699ab8 Mon Sep 17 00:00:00 2001 From: ludamad Date: Tue, 26 Sep 2023 10:59:48 +0100 Subject: [PATCH 07/10] [ci debug] From 57c7e9e6f359c2f2b4c6b9271af37d1ee1f6142a Mon Sep 17 00:00:00 2001 From: ludamad Date: Tue, 26 Sep 2023 11:02:20 +0100 Subject: [PATCH 08/10] [ci debug] From ddecf4080a7defc84c12b953efdac5ae48a4acfd Mon Sep 17 00:00:00 2001 From: ludamad Date: Tue, 26 Sep 2023 11:02:33 +0100 Subject: [PATCH 09/10] force debug in setup env --- build-system/scripts/setup_env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-system/scripts/setup_env b/build-system/scripts/setup_env index 29319f1b1b5c..1b04e173010d 100755 --- a/build-system/scripts/setup_env +++ b/build-system/scripts/setup_env @@ -6,7 +6,7 @@ # The script should be sourced from the root of the repository, e.g: # source ./build-system/scripts/setup_env # This ensures the resultant variables are set in the calling shell. -set -eu +set -xeu COMMIT_HASH=$1 COMMIT_TAG=${2##*aztec-packages-} From 38321456343c8d22f2778187602bdfb31a569397 Mon Sep 17 00:00:00 2001 From: ludamad Date: Tue, 26 Sep 2023 11:06:46 +0100 Subject: [PATCH 10/10] Remove debug now that its mysteriously working --- build-system/scripts/setup_env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-system/scripts/setup_env b/build-system/scripts/setup_env index 1b04e173010d..29319f1b1b5c 100755 --- a/build-system/scripts/setup_env +++ b/build-system/scripts/setup_env @@ -6,7 +6,7 @@ # The script should be sourced from the root of the repository, e.g: # source ./build-system/scripts/setup_env # This ensures the resultant variables are set in the calling shell. -set -xeu +set -eu COMMIT_HASH=$1 COMMIT_TAG=${2##*aztec-packages-}