Skip to content

Commit

Permalink
chore(subrepo): push aztec-nr, update default branches (#2300)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Maddiaa0 authored Sep 14, 2023
1 parent f40c37a commit 80c9b77
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/mirror_repos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]"
Expand All @@ -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]"
Expand All @@ -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]"
Expand Down
4 changes: 2 additions & 2 deletions yarn-project/aztec-nr/.gitrepo
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions yarn-project/aztec-nr/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<h1>Aztec.nr</h1>

<p>
<strong>Aztec Smart Contract Development Framework</strong>
<strong>Aztec Smart Contract Framework</strong>
</p>

<p>
Expand All @@ -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
```
Expand Down

0 comments on commit 80c9b77

Please sign in to comment.