Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(subrepo): push aztec-nr, update default branches #2300

Merged
merged 5 commits into from
Sep 14, 2023
Merged

chore(subrepo): push aztec-nr, update default branches #2300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8b7b340
fix: update mirror repo to master on correct repos
Maddiaa0 Sep 14, 2023
748ddaa
git_subrepo.sh: Fix parent in .gitrepo file.
Maddiaa0 Sep 14, 2023
10b1a5d
git subrepo push --branch=master yarn-project/aztec-nr
Maddiaa0 Sep 14, 2023
62376ba
fix: update readme
Maddiaa0 Sep 14, 2023
2632244
git subrepo push --branch=master yarn-project/aztec-nr
Maddiaa0 Sep 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/mirror_repos.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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