From 8b7b34024c8f67ab83e74eb1a332b20fcb63adbf Mon Sep 17 00:00:00 2001 From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com> Date: Thu, 14 Sep 2023 14:33:21 +0000 Subject: [PATCH 1/5] fix: update mirror repo to master on correct repos --- .github/workflows/mirror_repos.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/mirror_repos.yml b/.github/workflows/mirror_repos.yml index f93244bbce2..7712b17ec3c 100644 --- a/.github/workflows/mirror_repos.yml +++ b/.github/workflows/mirror_repos.yml @@ -50,7 +50,7 @@ jobs: 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 + 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 commit --amend -m "$(git log -1 --pretty=%B) [skip ci]" @@ -71,7 +71,7 @@ jobs: 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 + 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 commit --amend -m "$(git log -1 --pretty=%B) [skip ci]" @@ -92,7 +92,7 @@ jobs: 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 + 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 commit --amend -m "$(git log -1 --pretty=%B) [skip ci]" From 748ddaa845fe6485648f7697df5d2e06108f2577 Mon Sep 17 00:00:00 2001 From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com> Date: Thu, 14 Sep 2023 14:34:14 +0000 Subject: [PATCH 2/5] git_subrepo.sh: Fix parent in .gitrepo file. --- yarn-project/aztec-nr/.gitrepo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yarn-project/aztec-nr/.gitrepo b/yarn-project/aztec-nr/.gitrepo index 9b54eedeb04..e53b092ed2e 100644 --- a/yarn-project/aztec-nr/.gitrepo +++ b/yarn-project/aztec-nr/.gitrepo @@ -9,4 +9,4 @@ commit = f662901567fa19e205062d84180763f06cddd641 method = merge cmdver = 0.4.6 - parent = 8df8fa7351ca79c022e2eb7dddfd7cf0145876df + parent = a91db48d1943fdc2e39535a153216b7aaca40de4 From 10b1a5dd15d27681606fc226b136838527a825ba Mon Sep 17 00:00:00 2001 From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com> Date: Thu, 14 Sep 2023 14:34:18 +0000 Subject: [PATCH 3/5] git subrepo push --branch=master yarn-project/aztec-nr subrepo: subdir: "yarn-project/aztec-nr" merged: "05f63d4c1" upstream: origin: "git@github.com:AztecProtocol/aztec-nr.git" branch: "master" commit: "05f63d4c1" git-subrepo: version: "0.4.6" origin: "???" commit: "???" --- yarn-project/aztec-nr/.gitrepo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yarn-project/aztec-nr/.gitrepo b/yarn-project/aztec-nr/.gitrepo index e53b092ed2e..0968800ebf7 100644 --- a/yarn-project/aztec-nr/.gitrepo +++ b/yarn-project/aztec-nr/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = git@github.com:AztecProtocol/aztec-nr.git branch = master - commit = f662901567fa19e205062d84180763f06cddd641 + commit = 05f63d4c14d73e6112d6aafdacb6e4ece209caad method = merge cmdver = 0.4.6 - parent = a91db48d1943fdc2e39535a153216b7aaca40de4 + parent = 748ddaa845fe6485648f7697df5d2e06108f2577 From 62376ba4513fffdd96fd0b85c2b5884ec8bb224f Mon Sep 17 00:00:00 2001 From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com> Date: Thu, 14 Sep 2023 14:42:51 +0000 Subject: [PATCH 4/5] fix: update readme --- yarn-project/aztec-nr/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yarn-project/aztec-nr/README.md b/yarn-project/aztec-nr/README.md index c137de45e0c..b5f09142a4a 100644 --- a/yarn-project/aztec-nr/README.md +++ b/yarn-project/aztec-nr/README.md @@ -4,7 +4,7 @@
- Aztec Smart Contract Development Framework + Aztec Smart Contract Framework
@@ -18,7 +18,7 @@ # Aztec.nr -`Aztec-nr` is a [Noir](https://noir-lang.org) framework for contract development on [Aztec](aztec.network). +`Aztec-nr` is a [Noir](https://noir-lang.org) framework for smart contracts on [Aztec](aztec.network). ### Directory Structure ``` From 263224441ca9fc7aafc2eecea2669e649ebe845d Mon Sep 17 00:00:00 2001 From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com> Date: Thu, 14 Sep 2023 14:43:08 +0000 Subject: [PATCH 5/5] git subrepo push --branch=master yarn-project/aztec-nr subrepo: subdir: "yarn-project/aztec-nr" merged: "d6bea82a9" upstream: origin: "git@github.com:AztecProtocol/aztec-nr.git" branch: "master" commit: "d6bea82a9" git-subrepo: version: "0.4.6" origin: "???" commit: "???" --- yarn-project/aztec-nr/.gitrepo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yarn-project/aztec-nr/.gitrepo b/yarn-project/aztec-nr/.gitrepo index 0968800ebf7..634493055c9 100644 --- a/yarn-project/aztec-nr/.gitrepo +++ b/yarn-project/aztec-nr/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = git@github.com:AztecProtocol/aztec-nr.git branch = master - commit = 05f63d4c14d73e6112d6aafdacb6e4ece209caad + commit = d6bea82a92949b51e70ca5e9061252f9ccfe0c7e method = merge cmdver = 0.4.6 - parent = 748ddaa845fe6485648f7697df5d2e06108f2577 + parent = 62376ba4513fffdd96fd0b85c2b5884ec8bb224f