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

fix(ci): add install backend step in noir rebuild #2182

Merged
merged 5 commits into from
Sep 11, 2023
Merged

fix(ci): add install backend step in noir rebuild #2182

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
79ec6c8
fix: add install backend step in noir rebuild
Maddiaa0 Sep 11, 2023
e401c11
fix: add to bootstrap
Maddiaa0 Sep 11, 2023
2245a1f
Merge branch 'master' into md/add-backend-stap
Maddiaa0 Sep 11, 2023
776c77e
fix: error message format change
Maddiaa0 Sep 11, 2023
61f6af9
fix: formatting
Maddiaa0 Sep 11, 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 yarn-project/aztec.js/src/abis/ecdsa_account_contract.json
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions yarn-project/aztec.js/src/abis/schnorr_account_contract.json
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions yarn-project/aztec.js/src/abis/schnorr_auth_witness_account_contract.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion yarn-project/aztec.js/src/abis/schnorr_single_key_account_contract.json
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions yarn-project/noir-contracts/Dockerfile.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ RUN ./scripts/install_noirup.sh $(pwd)
ENV PATH="/usr/src/yarn-project/noir-contracts/.nargo/bin:${PATH}"

RUN ./scripts/install_noir.sh
RUN ./scripts/install_noir_backend.sh
RUN ./scripts/compile_ci.sh
1 change: 1 addition & 0 deletions yarn-project/noir-contracts/bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ fi

# Update noir
./scripts/install_noir.sh
./scripts/install_noir_backend.sh

# Use yarn script to compile and create types
yarn
Expand Down
13 changes: 13 additions & 0 deletions yarn-project/noir-contracts/scripts/install_noir_backend.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/bash

# Script to install the current barretenberg backend

set -eu

BACKEND_NAME="acvm-backend-barretenberg"

# If the backend is not installed, then install it
if [ -z $(nargo backend ls | grep $BACKEND_NAME) ]; then
echo "Installing $BACKEND_NAME"
nargo backend install $BACKEND_NAME https://github.com/AztecProtocol/barretenberg/releases/download/barretenberg-v0.5.1/barretenberg-x86_64-linux-gnu.tar.gz
Comment on lines +11 to +12
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If there was no parallel compile, could we revert this PR?

Asking because:

  • Theres a PR to compile contracts in parallel by Tom
  • This is likely to be a footgun in the future

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a blocker on this PR

Copy link
Member Author

@Maddiaa0 Maddiaa0 Sep 11, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep this is only an issue as we compile in parallel and each instance try's to fetch the backend

fi