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.

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

chore: Improve temporary stopgap implemented in 4014 #4036

Merged
merged 9 commits into from
Jan 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/scripts/acvm_js-build.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
set -eu

.github/scripts/install_wasm-bindgen.sh
.github/scripts/wasm-bindgen-install.sh
yarn workspace @noir-lang/acvm_js build
3 changes: 1 addition & 2 deletions .github/scripts/noir-wasm-build.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/bin/bash
set -eu

.github/scripts/noirc-abi-build.sh

.github/scripts/wasm-pack-install.sh
yarn workspace @noir-lang/noir_wasm build
2 changes: 1 addition & 1 deletion .github/scripts/noirc-abi-build.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
set -eu

.github/scripts/install_wasm-bindgen.sh
.github/scripts/wasm-bindgen-install.sh
yarn workspace @noir-lang/noirc_abi build
5 changes: 5 additions & 0 deletions .github/scripts/wasm-pack-install.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/bash
set -eu

curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
cargo-binstall wasm-pack --version 0.12.1 -y
20 changes: 19 additions & 1 deletion .github/workflows/docker-test-flow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,13 +124,19 @@ jobs:
build-noir-wasm:
name: Build noir wasm
runs-on: ubuntu-latest
needs: [build-base-js]
needs: [build-base-js, build-noirc-abi]
container:
image: ghcr.io/noir-lang/noir:${{ github.sha }}-js
credentials:
username: ${{ github.actor }}
password: ${{ secrets.github_token }}
steps:
- name: Download noirc abi
uses: actions/download-artifact@v4
with:
name: noirc_abi_wasm
path: |
/usr/src/noir/tooling/noirc_abi_wasm
- name: Build
working-directory: /usr/src/noir
run: |
Expand Down Expand Up @@ -160,6 +166,12 @@ jobs:
- name: Prep downloaded artifact
run: |
chmod +x /usr/src/noir/target/release/nargo
- name: Download noirc abi
uses: actions/download-artifact@v4
with:
name: noirc_abi_wasm
path: |
/usr/src/noir/tooling/noirc_abi_wasm
- name: Download noir_wasm artifact
uses: actions/download-artifact@v4
with:
Expand Down Expand Up @@ -188,6 +200,12 @@ jobs:
- name: Prep downloaded artifact
run: |
chmod +x /usr/src/noir/target/release/nargo
- name: Download noirc abi
uses: actions/download-artifact@v4
with:
name: noirc_abi_wasm
path: |
/usr/src/noir/tooling/noirc_abi_wasm
- name: Download noir_wasm artifact
uses: actions/download-artifact@v4
with:
Expand Down
Loading