diff --git a/.github/workflows/mirror_repos.yml b/.github/workflows/mirror_repos.yml index f93244bbce2a..7712b17ec3c3 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]" diff --git a/yarn-project/aztec-nr/.gitrepo b/yarn-project/aztec-nr/.gitrepo index 9b54eedeb04f..634493055c9c 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 = d6bea82a92949b51e70ca5e9061252f9ccfe0c7e method = merge cmdver = 0.4.6 - parent = 8df8fa7351ca79c022e2eb7dddfd7cf0145876df + parent = 62376ba4513fffdd96fd0b85c2b5884ec8bb224f diff --git a/yarn-project/aztec-nr/README.md b/yarn-project/aztec-nr/README.md index c137de45e0cb..b5f09142a4ab 100644 --- a/yarn-project/aztec-nr/README.md +++ b/yarn-project/aztec-nr/README.md @@ -4,7 +4,7 @@

Aztec.nr

- 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 ```