Skip to content

Commit 0cf0090

Browse files
committed
ci: new installation approach
1 parent a3b196d commit 0cf0090

File tree

2 files changed

+17
-23
lines changed

2 files changed

+17
-23
lines changed

.github/workflows/ci.yml

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -110,33 +110,27 @@ jobs:
110110
uses: noir-lang/[email protected]
111111
with:
112112
toolchain: '1.0.0-beta.6'
113-
113+
114114
- name: Install Barretenberg
115+
shell: bash
115116
run: |
116-
# Create bin directory
117-
mkdir -p $HOME/.local/bin
118-
119-
echo "Downloading bbup installer..."
120-
curl -L https://raw.githubusercontent.com/AztecProtocol/aztec-packages/master/barretenberg/bbup/install | bash
121-
# Copy bb from bbup installation if it exists
122-
if [ -f "$HOME/.bbup/bin/bb" ]; then
123-
cp "$HOME/.bbup/bin/bb" "$HOME/.local/bin/bb"
124-
echo "Copied bb from bbup installation"
125-
else
126-
echo "ERROR: Could not install bb through any method"
127-
exit 1
128-
fi
129-
130-
# Make it executable
131-
chmod +x $HOME/.local/bin/bb
132-
133-
# Add to PATH using GitHub Actions standard method
134-
echo "$HOME/.local/bin" >> $GITHUB_PATH
117+
mkdir -p $HOME/.bb
118+
curl -L -o $HOME/.bb/bbup_installer https://raw.githubusercontent.com/AztecProtocol/aztec-packages/master/barretenberg/bbup/install
119+
echo "Installer downloaded..."
120+
chmod +x $HOME/.bb/bbup_installer
121+
echo "Installer made executable..."
122+
bash $HOME/.bb/bbup_installer
123+
echo "bbup installed..."
124+
echo "${HOME}/.bb" >> $GITHUB_PATH
125+
echo "Added ${HOME}/.bb to PATH"
126+
bash $HOME/.bb/bbup -nv 1.0.0-beta.6
127+
echo "bbup executed..."
135128
136129
- name: Verify Barretenberg installation
130+
shell: bash
137131
run: |
138-
bb --version
139132
which bb
133+
bb --version
140134
141135
- name: Install dependencies
142136
run: yarn install --frozen-lockfile

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
"circuit:verify": "cd circuit && bb verify -k ./target/vk -p ./target/proof --oracle_hash keccak",
3636
"circuit:test": "cd circuit && nargo test",
3737
"contracts:deploy": "npx hardhat ignition deploy ./ignition/modules/SimpleCounter.ts --network sepolia --verify",
38-
"contracts:compile": "COMPILE=true npx hardhat compile",
39-
"contracts:test": "TEST=true npx hardhat test",
38+
"contracts:compile": "npx hardhat compile",
39+
"contracts:test": "npx hardhat test",
4040
"commitlint": "commitlint --edit",
4141
"commitlint:last": "commitlint --from HEAD~1 --to HEAD --verbose",
4242
"prepare": "husky"

0 commit comments

Comments
 (0)