Skip to content

Commit 80c9b77

Browse files
authored
chore(subrepo): push aztec-nr, update default branches (#2300)
Wrong target branch on some repos, pushed bb to main not master (i copied the flow for docs which did use main). Manually pushed aztec-nr, it failed last night as the bot did not have write perms
1 parent f40c37a commit 80c9b77

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.github/workflows/mirror_repos.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
git config --global user.name AztecBot
5151
git config --global user.email tech@aztecprotocol.com
5252
53-
if ./scripts/git_subrepo.sh push $SUBREPO_PATH --branch=main; then
53+
if ./scripts/git_subrepo.sh push $SUBREPO_PATH --branch=master; then
5454
git fetch # in case a commit came after this
5555
git rebase origin/master
5656
git commit --amend -m "$(git log -1 --pretty=%B) [skip ci]"
@@ -71,7 +71,7 @@ jobs:
7171
git config --global user.name AztecBot
7272
git config --global user.email tech@aztecprotocol.com
7373
74-
if ./scripts/git_subrepo.sh push $SUBREPO_PATH --branch=main; then
74+
if ./scripts/git_subrepo.sh push $SUBREPO_PATH --branch=master; then
7575
git fetch # in case a commit came after this
7676
git rebase origin/master
7777
git commit --amend -m "$(git log -1 --pretty=%B) [skip ci]"
@@ -92,7 +92,7 @@ jobs:
9292
git config --global user.name AztecBot
9393
git config --global user.email tech@aztecprotocol.com
9494
95-
if ./scripts/git_subrepo.sh push $SUBREPO_PATH --branch=main; then
95+
if ./scripts/git_subrepo.sh push $SUBREPO_PATH --branch=master; then
9696
git fetch # in case a commit came after this
9797
git rebase origin/master
9898
git commit --amend -m "$(git log -1 --pretty=%B) [skip ci]"

yarn-project/aztec-nr/.gitrepo

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[subrepo]
77
remote = git@github.com:AztecProtocol/aztec-nr.git
88
branch = master
9-
commit = f662901567fa19e205062d84180763f06cddd641
9+
commit = d6bea82a92949b51e70ca5e9061252f9ccfe0c7e
1010
method = merge
1111
cmdver = 0.4.6
12-
parent = 8df8fa7351ca79c022e2eb7dddfd7cf0145876df
12+
parent = 62376ba4513fffdd96fd0b85c2b5884ec8bb224f

yarn-project/aztec-nr/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<h1>Aztec.nr</h1>
55

66
<p>
7-
<strong>Aztec Smart Contract Development Framework</strong>
7+
<strong>Aztec Smart Contract Framework</strong>
88
</p>
99

1010
<p>
@@ -18,7 +18,7 @@
1818

1919
# Aztec.nr
2020

21-
`Aztec-nr` is a [Noir](https://noir-lang.org) framework for contract development on [Aztec](aztec.network).
21+
`Aztec-nr` is a [Noir](https://noir-lang.org) framework for smart contracts on [Aztec](aztec.network).
2222

2323
### Directory Structure
2424
```

0 commit comments

Comments
 (0)