From e133e77fbe59bfbef796dd5872d1d440a4ad4a68 Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 12 Dec 2023 12:14:52 +0000 Subject: [PATCH 001/182] test --- .github/workflows/test-cargo.yml | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-cargo.yml b/.github/workflows/test-cargo.yml index e6c9f323b1f..1992e1b0d89 100644 --- a/.github/workflows/test-cargo.yml +++ b/.github/workflows/test-cargo.yml @@ -3,7 +3,8 @@ name: Test cargo on: push: branches: - - 'master' + # - 'master' + - 'cache-docker-artifacts' jobs: build: @@ -41,4 +42,20 @@ jobs: tags: ${{ steps.prep.outputs.tags }} target: test-cargo cache-from: type=gha - cache-to: type=gha,mode=max \ No newline at end of file + cache-to: type=gha,mode=max + - name: Copy artifact from from container + uses: shrink/actions-docker-extract@v3 + with: + image: ${{ steps.prep.outputs.tags }} + path: /usr/src/noir/target + destination: /dist + - name: Copy .cargo from container + uses: shrink/actions-docker-extract@v3 + with: + image: ${{ steps.prep.outputs.tags }} + path: /usr/local/cargo/ + destination: /cargo + - name: test-dist + run: tar -czvf /dist /dist.tar + - name: test-cargo + run: tar -czvf /cargo /cargo.tar \ No newline at end of file From 9e9670bdc7b386c4c87a8685d11a4e0b181b03ff Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 12 Dec 2023 12:29:01 +0000 Subject: [PATCH 002/182] test --- .github/workflows/test-cargo.yml | 21 +------ .github/workflows/test-github-artifacts.yml | 68 +++++++++++++++++++++ 2 files changed, 70 insertions(+), 19 deletions(-) create mode 100644 .github/workflows/test-github-artifacts.yml diff --git a/.github/workflows/test-cargo.yml b/.github/workflows/test-cargo.yml index 1992e1b0d89..e6c9f323b1f 100644 --- a/.github/workflows/test-cargo.yml +++ b/.github/workflows/test-cargo.yml @@ -3,8 +3,7 @@ name: Test cargo on: push: branches: - # - 'master' - - 'cache-docker-artifacts' + - 'master' jobs: build: @@ -42,20 +41,4 @@ jobs: tags: ${{ steps.prep.outputs.tags }} target: test-cargo cache-from: type=gha - cache-to: type=gha,mode=max - - name: Copy artifact from from container - uses: shrink/actions-docker-extract@v3 - with: - image: ${{ steps.prep.outputs.tags }} - path: /usr/src/noir/target - destination: /dist - - name: Copy .cargo from container - uses: shrink/actions-docker-extract@v3 - with: - image: ${{ steps.prep.outputs.tags }} - path: /usr/local/cargo/ - destination: /cargo - - name: test-dist - run: tar -czvf /dist /dist.tar - - name: test-cargo - run: tar -czvf /cargo /cargo.tar \ No newline at end of file + cache-to: type=gha,mode=max \ No newline at end of file diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml new file mode 100644 index 00000000000..ce5336bbc20 --- /dev/null +++ b/.github/workflows/test-github-artifacts.yml @@ -0,0 +1,68 @@ +name: Test github artifacts + +on: + push: + branches: + # - 'master' + - 'cache-docker-artifacts' + +jobs: + build: + name: Test github artifacts + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v4 + - name: Get current date + id: date + run: echo "date=$(date +'%Y.%m.%d.%H.%M')" >> $GITHUB_STATE + - name: prepare docker images tags + id: prep + run: | + REGISTRY="ghcr.io" + IMG="${REGISTRY}/${{ github.repository }}" + IMAGE=$(echo "$IMG" | tr '[:upper:]' '[:lower:]') + TAGS="${IMAGE}:${{ github.sha }}" + TAGS="${TAGS},${IMAGE}:latest,${IMAGE}:v${{ steps.date.outputs.date }}" + echo ::set-output name=tags::${TAGS} + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@v3 + - name: Login to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Test cargo + uses: docker/build-push-action@v5 + with: + context: . + file: Dockerfile.ci + tags: ${{ steps.prep.outputs.tags }} + target: test-base + cache-from: type=gha + cache-to: type=gha,mode=max + - name: Copy artifact from from container + uses: shrink/actions-docker-extract@v3 + with: + image: ${{ steps.prep.outputs.tags }} + path: /usr/src/noir/target + destination: /dist + - name: Copy .cargo from container + uses: shrink/actions-docker-extract@v3 + with: + image: ${{ steps.prep.outputs.tags }} + path: /usr/local/cargo/ + destination: /cargo + - name: test-dist + run: tar -czvf /dist /dist.tar + - name: test-cargo + run: tar -czvf /cargo /cargo.tar + - name: test-cache + uses: actions/cache/save@v3 + with: + path: | + /dist.tar + /cargo.tar + key: ${{ runner.os }}-docker-artifact-cache \ No newline at end of file From 24f3749fea10c45e04d00794eadc24ea7ceb5cb3 Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 12 Dec 2023 12:39:35 +0000 Subject: [PATCH 003/182] fix --- .github/workflows/test-github-artifacts.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index ce5336bbc20..42bd1d403b4 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -56,9 +56,9 @@ jobs: path: /usr/local/cargo/ destination: /cargo - name: test-dist - run: tar -czvf /dist /dist.tar + run: sudo tar -czvf /dist /dist.tar - name: test-cargo - run: tar -czvf /cargo /cargo.tar + run: sudo tar -czvf /cargo /cargo.tar - name: test-cache uses: actions/cache/save@v3 with: From 14502feb05f050e2ace7be0cd89fb663e4341117 Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 12 Dec 2023 12:50:44 +0000 Subject: [PATCH 004/182] test --- .github/workflows/test-github-artifacts.yml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index 42bd1d403b4..bc701c2e23a 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -44,17 +44,9 @@ jobs: cache-from: type=gha cache-to: type=gha,mode=max - name: Copy artifact from from container - uses: shrink/actions-docker-extract@v3 - with: - image: ${{ steps.prep.outputs.tags }} - path: /usr/src/noir/target - destination: /dist - - name: Copy .cargo from container - uses: shrink/actions-docker-extract@v3 - with: - image: ${{ steps.prep.outputs.tags }} - path: /usr/local/cargo/ - destination: /cargo + run: sudo docker cp ${{ steps.prep.outputs.tags }}:/usr/src/noir/target /dist + - name: Copy cargo from from container + run: sudo docker cp ${{ steps.prep.outputs.tags }}:/usr/local/cargo/ /cargo - name: test-dist run: sudo tar -czvf /dist /dist.tar - name: test-cargo From 18ea4ef18e258bb9a77cd2d26ab58bc4a7bee7be Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 12 Dec 2023 14:34:53 +0000 Subject: [PATCH 005/182] test --- .github/workflows/test-github-artifacts.yml | 8 +++++--- scripts/install_wasm-bindgen-new.sh | 4 ++++ 2 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 scripts/install_wasm-bindgen-new.sh diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index bc701c2e23a..cfeb0b48de9 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -24,7 +24,9 @@ jobs: IMAGE=$(echo "$IMG" | tr '[:upper:]' '[:lower:]') TAGS="${IMAGE}:${{ github.sha }}" TAGS="${TAGS},${IMAGE}:latest,${IMAGE}:v${{ steps.date.outputs.date }}" - echo ::set-output name=tags::${TAGS} + # echo ::set-output name=tags::${TAGS} + echo "{tags}={${TAGS}}" >> $GITHUB_OUTPUT + echo "{image}={${IMAGE}}" >> $GITHUB_OUTPUT - name: Set up Docker Buildx id: buildx uses: docker/setup-buildx-action@v3 @@ -44,9 +46,9 @@ jobs: cache-from: type=gha cache-to: type=gha,mode=max - name: Copy artifact from from container - run: sudo docker cp ${{ steps.prep.outputs.tags }}:/usr/src/noir/target /dist + run: sudo docker cp ${{ steps.prep.outputs.image }}:latest:/usr/src/noir/target /dist - name: Copy cargo from from container - run: sudo docker cp ${{ steps.prep.outputs.tags }}:/usr/local/cargo/ /cargo + run: sudo docker cp ${{ steps.prep.outputs.image }}:latest:/usr/local/cargo/ /cargo - name: test-dist run: sudo tar -czvf /dist /dist.tar - name: test-cargo diff --git a/scripts/install_wasm-bindgen-new.sh b/scripts/install_wasm-bindgen-new.sh new file mode 100644 index 00000000000..8bd53ab1d08 --- /dev/null +++ b/scripts/install_wasm-bindgen-new.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +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-bindgen-cli --version 0.2.86 From b98fd25f2ec4ef9988f51945eeffbf6f7ba0341a Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 12 Dec 2023 14:46:13 +0000 Subject: [PATCH 006/182] asfd --- .github/workflows/test-github-artifacts.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index cfeb0b48de9..a3139289e9a 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -25,8 +25,8 @@ jobs: TAGS="${IMAGE}:${{ github.sha }}" TAGS="${TAGS},${IMAGE}:latest,${IMAGE}:v${{ steps.date.outputs.date }}" # echo ::set-output name=tags::${TAGS} - echo "{tags}={${TAGS}}" >> $GITHUB_OUTPUT - echo "{image}={${IMAGE}}" >> $GITHUB_OUTPUT + echo "tags=$TAGS" >> $GITHUB_OUTPUT + echo "image=$IMAGE" >> $GITHUB_OUTPUT - name: Set up Docker Buildx id: buildx uses: docker/setup-buildx-action@v3 From 7b2d905f74ce658eb3813cade6061e892dc75ed0 Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 12 Dec 2023 15:12:18 +0000 Subject: [PATCH 007/182] test --- .github/workflows/test-github-artifacts.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index a3139289e9a..06f82dc6993 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -45,6 +45,7 @@ jobs: target: test-base cache-from: type=gha cache-to: type=gha,mode=max + push: true - name: Copy artifact from from container run: sudo docker cp ${{ steps.prep.outputs.image }}:latest:/usr/src/noir/target /dist - name: Copy cargo from from container From a3f6e007ef89527ac2776ff84273f9e30f7aa4f6 Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 12 Dec 2023 15:15:29 +0000 Subject: [PATCH 008/182] tes --- .github/workflows/test-github-artifacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index 06f82dc6993..66a27633af5 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -45,7 +45,7 @@ jobs: target: test-base cache-from: type=gha cache-to: type=gha,mode=max - push: true + load: true - name: Copy artifact from from container run: sudo docker cp ${{ steps.prep.outputs.image }}:latest:/usr/src/noir/target /dist - name: Copy cargo from from container From efc3c4c90f9f6e9abed297e66702251e29357c74 Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 12 Dec 2023 15:30:10 +0000 Subject: [PATCH 009/182] asdf --- .github/workflows/test-github-artifacts.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index 66a27633af5..7a7f26e16cd 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -46,10 +46,16 @@ jobs: cache-from: type=gha cache-to: type=gha,mode=max load: true - - name: Copy artifact from from container - run: sudo docker cp ${{ steps.prep.outputs.image }}:latest:/usr/src/noir/target /dist - - name: Copy cargo from from container - run: sudo docker cp ${{ steps.prep.outputs.image }}:latest:/usr/local/cargo/ /cargo + - name: run image + run: | + id=$(docker create ${{ steps.prep.outputs.image }}:latest) + sudo docker cp $id:/usr/src/noir/target /dist + sudo docker cp $id:/usr/local/cargo/ /cargo + sudo docker rm -v $id + # - name: Copy artifact from from container + # run: sudo docker cp ${{ steps.prep.outputs.image }}:latest:/usr/src/noir/target /dist + # - name: Copy cargo from from container + # run: sudo docker cp ${{ steps.prep.outputs.image }}:latest:/usr/local/cargo/ /cargo - name: test-dist run: sudo tar -czvf /dist /dist.tar - name: test-cargo From 4a528d2a9f48d18aaa96c54c1126be7c56b467f6 Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 12 Dec 2023 15:41:22 +0000 Subject: [PATCH 010/182] adsf --- .github/workflows/test-github-artifacts.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index 7a7f26e16cd..9511a7126ed 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -57,9 +57,9 @@ jobs: # - name: Copy cargo from from container # run: sudo docker cp ${{ steps.prep.outputs.image }}:latest:/usr/local/cargo/ /cargo - name: test-dist - run: sudo tar -czvf /dist /dist.tar + run: sudo tar -czvf /dist.tar.gz /dist - name: test-cargo - run: sudo tar -czvf /cargo /cargo.tar + run: sudo tar -czvf /cargo.tar.gz /cargo - name: test-cache uses: actions/cache/save@v3 with: From 514ed11f6c990fc6bc2cbdc77c8264b6997acb0d Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 12 Dec 2023 15:58:51 +0000 Subject: [PATCH 011/182] asdf --- .github/workflows/test-github-artifacts.yml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index 9511a7126ed..e1435568650 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -50,20 +50,16 @@ jobs: run: | id=$(docker create ${{ steps.prep.outputs.image }}:latest) sudo docker cp $id:/usr/src/noir/target /dist - sudo docker cp $id:/usr/local/cargo/ /cargo + sudo docker cp $id:/usr/local/cargo /cargo sudo docker rm -v $id - # - name: Copy artifact from from container - # run: sudo docker cp ${{ steps.prep.outputs.image }}:latest:/usr/src/noir/target /dist - # - name: Copy cargo from from container - # run: sudo docker cp ${{ steps.prep.outputs.image }}:latest:/usr/local/cargo/ /cargo - - name: test-dist - run: sudo tar -czvf /dist.tar.gz /dist - - name: test-cargo - run: sudo tar -czvf /cargo.tar.gz /cargo + - name: tar + run: | + sudo tar -czvf /dist.tar.gz /dist + sudo tar -czvf /cargo.tar.gz /cargo - name: test-cache uses: actions/cache/save@v3 with: path: | - /dist.tar - /cargo.tar + /dist.tar.gz + /cargo.tar.gz key: ${{ runner.os }}-docker-artifact-cache \ No newline at end of file From e70c11bd6e8e3609016d20b1768136bdd188e4cd Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 12 Dec 2023 18:22:41 +0000 Subject: [PATCH 012/182] asdf --- .github/workflows/test-github-artifacts.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index e1435568650..f5dfabe6259 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -36,6 +36,11 @@ jobs: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} + # - name: test-cache + # uses: actions/cache/restore@v3 + # with: + # key: cache-${{ hashFiles('**/lockfiles') }} + # path: /dist - name: Test cargo uses: docker/build-push-action@v5 with: @@ -49,17 +54,17 @@ jobs: - name: run image run: | id=$(docker create ${{ steps.prep.outputs.image }}:latest) - sudo docker cp $id:/usr/src/noir/target /dist + sudo docker cp $id:/usr/src/noir/target /target sudo docker cp $id:/usr/local/cargo /cargo sudo docker rm -v $id - name: tar run: | - sudo tar -czvf /dist.tar.gz /dist - sudo tar -czvf /cargo.tar.gz /cargo + sudo mkdir /dist + sudo tar -czvf /target.tar.gz /dist/target + sudo tar -czvf /cargo.tar.gz /dist/cargo + mkdir - name: test-cache uses: actions/cache/save@v3 with: - path: | - /dist.tar.gz - /cargo.tar.gz - key: ${{ runner.os }}-docker-artifact-cache \ No newline at end of file + path: /dist + key: ${{ runner.os }}-noir-base-docker-artifact-cache \ No newline at end of file From c507c740db7ec289e4631df60468bd7ac6f864ec Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 13 Dec 2023 11:15:58 +0000 Subject: [PATCH 013/182] cache --- .github/workflows/test-github-artifacts.yml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index f5dfabe6259..6257116dd32 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -36,12 +36,15 @@ jobs: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - # - name: test-cache - # uses: actions/cache/restore@v3 - # with: - # key: cache-${{ hashFiles('**/lockfiles') }} - # path: /dist - - name: Test cargo + - name: test-cache-restore + uses: actions/cache/restore@v3 + with: + path: /dist + key: ${{ runner.os }}-noir-base-docker-artifact-cache-$GITHUB_REF-$GITHUB_SHA + restore-keys: | + ${{ runner.os }}-noir-base-docker-artifact-cache-$GITHUB_REF- + ${{ runner.os }}-noir-base-docker-artifact-cache- + - name: Build cargo uses: docker/build-push-action@v5 with: context: . @@ -63,8 +66,8 @@ jobs: sudo tar -czvf /target.tar.gz /dist/target sudo tar -czvf /cargo.tar.gz /dist/cargo mkdir - - name: test-cache + - name: test-cache-save uses: actions/cache/save@v3 with: path: /dist - key: ${{ runner.os }}-noir-base-docker-artifact-cache \ No newline at end of file + key: ${{ runner.os }}-noir-base-docker-artifact-cache-$GITHUB_REF-$GITHUB_SHA \ No newline at end of file From a25230b4fcb16caf95a8c57d9f4821416b66f29f Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 13 Dec 2023 11:19:53 +0000 Subject: [PATCH 014/182] fix --- .github/workflows/test-github-artifacts.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index 6257116dd32..867aeebbacc 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -40,9 +40,9 @@ jobs: uses: actions/cache/restore@v3 with: path: /dist - key: ${{ runner.os }}-noir-base-docker-artifact-cache-$GITHUB_REF-$GITHUB_SHA + key: ${{ runner.os }}-noir-base-docker-artifact-cache-${{ github.ref }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-noir-base-docker-artifact-cache-$GITHUB_REF- + ${{ runner.os }}-noir-base-docker-artifact-cache-${{ github.ref }}- ${{ runner.os }}-noir-base-docker-artifact-cache- - name: Build cargo uses: docker/build-push-action@v5 @@ -70,4 +70,4 @@ jobs: uses: actions/cache/save@v3 with: path: /dist - key: ${{ runner.os }}-noir-base-docker-artifact-cache-$GITHUB_REF-$GITHUB_SHA \ No newline at end of file + key: ${{ runner.os }}-noir-base-docker-artifact-cache--${{ github.ref }}-${{ github.sha }} \ No newline at end of file From 881fd4ef06db8507d67e21a64b86ad12d16f201d Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 13 Dec 2023 11:25:45 +0000 Subject: [PATCH 015/182] asdf --- .github/workflows/test-github-artifacts.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index 867aeebbacc..de2b5a01893 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -40,10 +40,10 @@ jobs: uses: actions/cache/restore@v3 with: path: /dist - key: ${{ runner.os }}-noir-base-docker-artifact-cache-${{ github.ref }}-${{ github.sha }} + key: ${{ runner.os }}-${{ runner.arch}}-noir-base-docker-artifact-cache-${{ github.ref }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-noir-base-docker-artifact-cache-${{ github.ref }}- - ${{ runner.os }}-noir-base-docker-artifact-cache- + ${{ runner.os }}-${{ runner.arch}}-noir-base-docker-artifact-cache-${{ github.ref }}- + ${{ runner.os }}-${{ runner.arch}}-noir-base-docker-artifact-cache- - name: Build cargo uses: docker/build-push-action@v5 with: @@ -70,4 +70,4 @@ jobs: uses: actions/cache/save@v3 with: path: /dist - key: ${{ runner.os }}-noir-base-docker-artifact-cache--${{ github.ref }}-${{ github.sha }} \ No newline at end of file + key: ${{ runner.os }}-${{ runner.arch}}-noir-base-docker-artifact-cache--${{ github.ref }}-${{ github.sha }} \ No newline at end of file From 35876356cd846a16ae56ba0ed4678e0dd6d55633 Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 13 Dec 2023 11:36:42 +0000 Subject: [PATCH 016/182] asdf --- .github/workflows/test-github-artifacts.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index de2b5a01893..a31c2495011 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -63,8 +63,8 @@ jobs: - name: tar run: | sudo mkdir /dist - sudo tar -czvf /target.tar.gz /dist/target - sudo tar -czvf /cargo.tar.gz /dist/cargo + sudo tar -czvf /dist/target.tar.gz /target + sudo tar -czvf /dist/cargo.tar.gz /cargo mkdir - name: test-cache-save uses: actions/cache/save@v3 From c39082613bd37732463ae4d1fd8fa25c861823f5 Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 13 Dec 2023 12:59:43 +0000 Subject: [PATCH 017/182] working --- .github/workflows/test-github-artifacts.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index a31c2495011..68b6eaeea76 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -65,7 +65,6 @@ jobs: sudo mkdir /dist sudo tar -czvf /dist/target.tar.gz /target sudo tar -czvf /dist/cargo.tar.gz /cargo - mkdir - name: test-cache-save uses: actions/cache/save@v3 with: From 8e38c1d956be16b4486e6d305af353e1407e62e8 Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 13 Dec 2023 15:00:47 +0000 Subject: [PATCH 018/182] test --- Dockerfile.ci.dockerignore | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 Dockerfile.ci.dockerignore diff --git a/Dockerfile.ci.dockerignore b/Dockerfile.ci.dockerignore new file mode 100644 index 00000000000..4bed62faf98 --- /dev/null +++ b/Dockerfile.ci.dockerignore @@ -0,0 +1,22 @@ +Dockerfile* +# .dockerignore + +# packages +# **/package.tgz +# **/target +# **/node_modules +# **/outputs + +# # Source resolver +# compiler/source-resolver/lib +# compiler/source-resolver/lib-node + +# # Noir.js +# tooling/noir_js/lib + +# # Wasm build artifacts +# compiler/wasm/nodejs +# compiler/wasm/web +# tooling/noirc_abi_wasm/nodejs +# tooling/noirc_abi_wasm/web +# tooling/noir_js/lib \ No newline at end of file From d19d46d2be115f0acb375953c7f5a87c2f767316 Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 13 Dec 2023 15:03:28 +0000 Subject: [PATCH 019/182] test --- .github/workflows/test-github-artifacts.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index 68b6eaeea76..7cc18274e4a 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -39,11 +39,13 @@ jobs: - name: test-cache-restore uses: actions/cache/restore@v3 with: - path: /dist + path: dist key: ${{ runner.os }}-${{ runner.arch}}-noir-base-docker-artifact-cache-${{ github.ref }}-${{ github.sha }} restore-keys: | ${{ runner.os }}-${{ runner.arch}}-noir-base-docker-artifact-cache-${{ github.ref }}- ${{ runner.os }}-${{ runner.arch}}-noir-base-docker-artifact-cache- + - name: test dist + run: ls dist - name: Build cargo uses: docker/build-push-action@v5 with: From 97bb429a66958c61bd0c458f0585a2b9c488e034 Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 13 Dec 2023 15:09:25 +0000 Subject: [PATCH 020/182] test --- .github/workflows/test-github-artifacts.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index 7cc18274e4a..bba096434e2 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -44,8 +44,6 @@ jobs: restore-keys: | ${{ runner.os }}-${{ runner.arch}}-noir-base-docker-artifact-cache-${{ github.ref }}- ${{ runner.os }}-${{ runner.arch}}-noir-base-docker-artifact-cache- - - name: test dist - run: ls dist - name: Build cargo uses: docker/build-push-action@v5 with: @@ -71,4 +69,4 @@ jobs: uses: actions/cache/save@v3 with: path: /dist - key: ${{ runner.os }}-${{ runner.arch}}-noir-base-docker-artifact-cache--${{ github.ref }}-${{ github.sha }} \ No newline at end of file + key: ${{ runner.os }}-${{ runner.arch}}-noir-base-docker-artifact-cache-${{ github.ref }}-${{ github.sha }} \ No newline at end of file From b1d5c4a543845e7aab251f2541e84ddcb5d2cfe4 Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 13 Dec 2023 15:11:38 +0000 Subject: [PATCH 021/182] asdf --- .github/workflows/test-github-artifacts.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index bba096434e2..f208dc41fae 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -37,6 +37,7 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: test-cache-restore + id: cache-restore uses: actions/cache/restore@v3 with: path: dist @@ -44,6 +45,9 @@ jobs: restore-keys: | ${{ runner.os }}-${{ runner.arch}}-noir-base-docker-artifact-cache-${{ github.ref }}- ${{ runner.os }}-${{ runner.arch}}-noir-base-docker-artifact-cache- + # - name: Install Dependencies + # if: steps.cache-restore.outputs.cache-hit == 'true' + # run: #do something - name: Build cargo uses: docker/build-push-action@v5 with: From 3b1f2243c7bfccbd971a7565fed5ea8bec4b484c Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 13 Dec 2023 15:27:22 +0000 Subject: [PATCH 022/182] test --- .github/workflows/test-github-artifacts.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index f208dc41fae..9d77fe08656 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -45,9 +45,9 @@ jobs: restore-keys: | ${{ runner.os }}-${{ runner.arch}}-noir-base-docker-artifact-cache-${{ github.ref }}- ${{ runner.os }}-${{ runner.arch}}-noir-base-docker-artifact-cache- - # - name: Install Dependencies - # if: steps.cache-restore.outputs.cache-hit == 'true' - # run: #do something + - name: Install Dependencies + if: steps.cache-restore.outputs.cache-hit == 'true' + run: #do something - name: Build cargo uses: docker/build-push-action@v5 with: From e48d8f1a046eaf57f146bab28bff7aee5a633b18 Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 13 Dec 2023 15:29:43 +0000 Subject: [PATCH 023/182] asdf --- .github/workflows/test-github-artifacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index 9d77fe08656..c261e826668 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -47,7 +47,7 @@ jobs: ${{ runner.os }}-${{ runner.arch}}-noir-base-docker-artifact-cache- - name: Install Dependencies if: steps.cache-restore.outputs.cache-hit == 'true' - run: #do something + run: echo test - name: Build cargo uses: docker/build-push-action@v5 with: From 3b6fe920f2e052ac69608a14a85adfce1641d037 Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 13 Dec 2023 15:47:08 +0000 Subject: [PATCH 024/182] asdf --- .github/workflows/test-github-artifacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index c261e826668..1bd23d1ff5c 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -47,7 +47,7 @@ jobs: ${{ runner.os }}-${{ runner.arch}}-noir-base-docker-artifact-cache- - name: Install Dependencies if: steps.cache-restore.outputs.cache-hit == 'true' - run: echo test + run: echo hi - name: Build cargo uses: docker/build-push-action@v5 with: From 622f5ae7a8330627cc160d211af86142f7496e01 Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 13 Dec 2023 16:03:14 +0000 Subject: [PATCH 025/182] test --- .github/workflows/test-github-artifacts.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index 1bd23d1ff5c..fd63fa7d9c6 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -41,10 +41,7 @@ jobs: uses: actions/cache/restore@v3 with: path: dist - key: ${{ runner.os }}-${{ runner.arch}}-noir-base-docker-artifact-cache-${{ github.ref }}-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-${{ runner.arch}}-noir-base-docker-artifact-cache-${{ github.ref }}- - ${{ runner.os }}-${{ runner.arch}}-noir-base-docker-artifact-cache- + key: ${{ runner.os }}-${{ runner.arch}}-noir-base-docker-artifact-cache - name: Install Dependencies if: steps.cache-restore.outputs.cache-hit == 'true' run: echo hi @@ -73,4 +70,4 @@ jobs: uses: actions/cache/save@v3 with: path: /dist - key: ${{ runner.os }}-${{ runner.arch}}-noir-base-docker-artifact-cache-${{ github.ref }}-${{ github.sha }} \ No newline at end of file + key: ${{ runner.os }}-${{ runner.arch}}-noir-base-docker-artifact-cache \ No newline at end of file From 071245b2b6ce9ccca07634c9fba2fd0deba12c7a Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 13 Dec 2023 16:20:17 +0000 Subject: [PATCH 026/182] asdf --- .github/workflows/test-github-artifacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index fd63fa7d9c6..d25c3966f61 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -44,7 +44,7 @@ jobs: key: ${{ runner.os }}-${{ runner.arch}}-noir-base-docker-artifact-cache - name: Install Dependencies if: steps.cache-restore.outputs.cache-hit == 'true' - run: echo hi + run: echo hihi - name: Build cargo uses: docker/build-push-action@v5 with: From d87b7aaea1ed727af54a2b3bae07e069da0e3cf4 Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 13 Dec 2023 16:30:24 +0000 Subject: [PATCH 027/182] asdf --- .github/workflows/test-github-artifacts.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index d25c3966f61..349b30f96cc 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -41,8 +41,8 @@ jobs: uses: actions/cache/restore@v3 with: path: dist - key: ${{ runner.os }}-${{ runner.arch}}-noir-base-docker-artifact-cache - - name: Install Dependencies + key: noir-base-docker-artifact-cache + - name: Cache was hit if: steps.cache-restore.outputs.cache-hit == 'true' run: echo hihi - name: Build cargo @@ -69,5 +69,5 @@ jobs: - name: test-cache-save uses: actions/cache/save@v3 with: - path: /dist - key: ${{ runner.os }}-${{ runner.arch}}-noir-base-docker-artifact-cache \ No newline at end of file + path: dist + key: noir-base-docker-artifact-cache \ No newline at end of file From 71056194e3a63246f1cfa23a7f0a7c7e282fcd23 Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 13 Dec 2023 17:08:53 +0000 Subject: [PATCH 028/182] test --- .github/workflows/test-github-artifacts.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index 349b30f96cc..551994a9345 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -63,9 +63,9 @@ jobs: sudo docker rm -v $id - name: tar run: | - sudo mkdir /dist - sudo tar -czvf /dist/target.tar.gz /target - sudo tar -czvf /dist/cargo.tar.gz /cargo + sudo mkdir dist + sudo tar -czvf dist/target.tar.gz /target + sudo tar -czvf dist/cargo.tar.gz /cargo - name: test-cache-save uses: actions/cache/save@v3 with: From 0cbf984ed023c0354b76b725b543439414437421 Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 13 Dec 2023 18:26:19 +0000 Subject: [PATCH 029/182] bump --- .github/workflows/test-github-artifacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index 551994a9345..3f0ecf3e597 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -44,7 +44,7 @@ jobs: key: noir-base-docker-artifact-cache - name: Cache was hit if: steps.cache-restore.outputs.cache-hit == 'true' - run: echo hihi + run: echo hi - name: Build cargo uses: docker/build-push-action@v5 with: From 03772210a690fca8e2b1dc07e54004fe1449736c Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 13 Dec 2023 18:53:57 +0000 Subject: [PATCH 030/182] test --- .github/workflows/test-github-artifacts.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index 3f0ecf3e597..550e47cfe12 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -44,11 +44,15 @@ jobs: key: noir-base-docker-artifact-cache - name: Cache was hit if: steps.cache-restore.outputs.cache-hit == 'true' - run: echo hi + run: | + sudo tar -xzvf dist/target.tar.gz /target + sudo tar -xzvf dist/cargo.tar.gz /usr/local/cargo - name: Build cargo uses: docker/build-push-action@v5 with: context: . + build-contexts: | + /usr/local/cargo file: Dockerfile.ci tags: ${{ steps.prep.outputs.tags }} target: test-base @@ -63,7 +67,7 @@ jobs: sudo docker rm -v $id - name: tar run: | - sudo mkdir dist + sudo mkdir -p dist sudo tar -czvf dist/target.tar.gz /target sudo tar -czvf dist/cargo.tar.gz /cargo - name: test-cache-save From fa5d9ec887922eeb8ba52c7764a32d46e839f313 Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 13 Dec 2023 18:57:30 +0000 Subject: [PATCH 031/182] asdf --- .github/workflows/test-github-artifacts.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index 550e47cfe12..b38d017d043 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -45,8 +45,8 @@ jobs: - name: Cache was hit if: steps.cache-restore.outputs.cache-hit == 'true' run: | - sudo tar -xzvf dist/target.tar.gz /target - sudo tar -xzvf dist/cargo.tar.gz /usr/local/cargo + sudo tar -xzvf dist/target.tar.gz -C /target + sudo tar -xzvf dist/cargo.tar.gz -C /usr/local/cargo - name: Build cargo uses: docker/build-push-action@v5 with: From 72cf3b70205acc1cc0d34802c0bf478a140bff88 Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 13 Dec 2023 18:59:25 +0000 Subject: [PATCH 032/182] test --- .github/workflows/test-github-artifacts.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index b38d017d043..e8ee555ee03 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -45,7 +45,9 @@ jobs: - name: Cache was hit if: steps.cache-restore.outputs.cache-hit == 'true' run: | - sudo tar -xzvf dist/target.tar.gz -C /target + mkdir -p target + mkdir -p /usr/local/cargo + sudo tar -xzvf dist/target.tar.gz -C target sudo tar -xzvf dist/cargo.tar.gz -C /usr/local/cargo - name: Build cargo uses: docker/build-push-action@v5 From 380021ad28df677135cab1580856f227ecffc8a2 Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 13 Dec 2023 19:00:19 +0000 Subject: [PATCH 033/182] asdf --- .github/workflows/test-github-artifacts.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index e8ee555ee03..c6378d459b6 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -45,8 +45,8 @@ jobs: - name: Cache was hit if: steps.cache-restore.outputs.cache-hit == 'true' run: | - mkdir -p target - mkdir -p /usr/local/cargo + sudo mkdir -p target + sudo mkdir -p /usr/local/cargo sudo tar -xzvf dist/target.tar.gz -C target sudo tar -xzvf dist/cargo.tar.gz -C /usr/local/cargo - name: Build cargo From 81e494ba83794fb04fde0fb9efa42cd39ae8dc3e Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 13 Dec 2023 19:02:45 +0000 Subject: [PATCH 034/182] asdf --- .github/workflows/test-github-artifacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index c6378d459b6..449eaf17fe3 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -54,7 +54,7 @@ jobs: with: context: . build-contexts: | - /usr/local/cargo + cargo=/usr/local/cargo file: Dockerfile.ci tags: ${{ steps.prep.outputs.tags }} target: test-base From 94d99a8e3bdb716d51d8cf99fad48aefa7b4867a Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 13 Dec 2023 19:07:07 +0000 Subject: [PATCH 035/182] test --- .dockerignore | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.dockerignore b/.dockerignore index 25dd24f015c..9aad28ddfe0 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,22 +1,22 @@ Dockerfile* .dockerignore -packages -**/package.tgz -**/target -**/node_modules -**/outputs +# packages +# **/package.tgz +# **/target +# **/node_modules +# **/outputs -# Source resolver -compiler/source-resolver/lib -compiler/source-resolver/lib-node +# # Source resolver +# compiler/source-resolver/lib +# compiler/source-resolver/lib-node -# Noir.js -tooling/noir_js/lib +# # Noir.js +# tooling/noir_js/lib -# Wasm build artifacts -compiler/wasm/nodejs -compiler/wasm/web -tooling/noirc_abi_wasm/nodejs -tooling/noirc_abi_wasm/web -tooling/noir_js/lib \ No newline at end of file +# # Wasm build artifacts +# compiler/wasm/nodejs +# compiler/wasm/web +# tooling/noirc_abi_wasm/nodejs +# tooling/noirc_abi_wasm/web +# tooling/noir_js/lib \ No newline at end of file From 5a91b5ee1a1e86e105bbe837a978bb146e5ae9c4 Mon Sep 17 00:00:00 2001 From: sklppy88 Date: Wed, 13 Dec 2023 19:32:42 +0000 Subject: [PATCH 036/182] test --- Dockerfile.ci | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/Dockerfile.ci b/Dockerfile.ci index e85a743e550..367919abe18 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1,9 +1,23 @@ -FROM rust:1-slim-bookworm as test-base +FROM rust:1-slim-bookworm as base RUN apt-get update && apt-get upgrade -y && apt-get install build-essential git -y +RUN cargo install cargo-chef + +FROM base AS planner +COPY . . +RUN cargo chef prepare --recipe-path recipe.json + +FROM base AS test-base WORKDIR /usr/src/noir +COPY --from=planner recipe.json recipe.json +RUN cargo chef cook --release --recipe-path recipe.json COPY . . -RUN ./scripts/bootstrap_native.sh -ENV PATH="${PATH}:/usr/src/noir/target/release/" +# RUN cargo build --release --bin app + +# FROM rust:1-slim-bookworm as test-base +# WORKDIR /usr/src/noir +# COPY . . +# # RUN ./scripts/bootstrap_native.sh +# ENV PATH="${PATH}:/usr/src/noir/target/release/" FROM test-base as test-cargo RUN apt-get install -y curl libc++-dev From 01293d08998e54c8bb63a8f9f797fce7d0bbdb7f Mon Sep 17 00:00:00 2001 From: Esau Date: Thu, 14 Dec 2023 12:22:00 +0000 Subject: [PATCH 037/182] bump --- Dockerfile.ci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.ci b/Dockerfile.ci index 367919abe18..549f267446a 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -17,7 +17,7 @@ COPY . . # WORKDIR /usr/src/noir # COPY . . # # RUN ./scripts/bootstrap_native.sh -# ENV PATH="${PATH}:/usr/src/noir/target/release/" +# ENV PATH="${PATH}:/usr/src/noir/target/release/"sadf FROM test-base as test-cargo RUN apt-get install -y curl libc++-dev From 927a6007d97062ad0650df266df49fa0cf7dab09 Mon Sep 17 00:00:00 2001 From: Esau Date: Thu, 14 Dec 2023 15:15:28 +0000 Subject: [PATCH 038/182] bump --- Dockerfile.ci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.ci b/Dockerfile.ci index 549f267446a..367919abe18 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -17,7 +17,7 @@ COPY . . # WORKDIR /usr/src/noir # COPY . . # # RUN ./scripts/bootstrap_native.sh -# ENV PATH="${PATH}:/usr/src/noir/target/release/"sadf +# ENV PATH="${PATH}:/usr/src/noir/target/release/" FROM test-base as test-cargo RUN apt-get install -y curl libc++-dev From e5449716f77e42ee07f5b0d0981b59f260334936 Mon Sep 17 00:00:00 2001 From: Esau Date: Thu, 14 Dec 2023 15:22:41 +0000 Subject: [PATCH 039/182] asdf --- .github/workflows/test-github-artifacts.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index 449eaf17fe3..ec725c8706b 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -49,12 +49,15 @@ jobs: sudo mkdir -p /usr/local/cargo sudo tar -xzvf dist/target.tar.gz -C target sudo tar -xzvf dist/cargo.tar.gz -C /usr/local/cargo + - name: Setup build context + if: steps.cache-restore.outputs.cache-hit == 'true' + run: echo "additional-build-context=cargo=/usr/local/cargo" >> $GITHUB_ENV - name: Build cargo uses: docker/build-push-action@v5 with: context: . build-contexts: | - cargo=/usr/local/cargo + ${{ env.additional-build-context }} file: Dockerfile.ci tags: ${{ steps.prep.outputs.tags }} target: test-base From cbeeba3597f8e70518796fb4e5082c47521b1279 Mon Sep 17 00:00:00 2001 From: Esau Date: Thu, 14 Dec 2023 15:35:08 +0000 Subject: [PATCH 040/182] test --- .github/workflows/test-github-artifacts.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index ec725c8706b..8cd881789c3 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -63,7 +63,8 @@ jobs: target: test-base cache-from: type=gha cache-to: type=gha,mode=max - load: true + # load: true + push: true - name: run image run: | id=$(docker create ${{ steps.prep.outputs.image }}:latest) From fb69fbf94d9b693dbd27896d1400ea94e8526633 Mon Sep 17 00:00:00 2001 From: Esau Date: Thu, 14 Dec 2023 15:45:45 +0000 Subject: [PATCH 041/182] asdf --- .github/workflows/test-github-artifacts.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index 8cd881789c3..a4dbaef539a 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -64,7 +64,9 @@ jobs: cache-from: type=gha cache-to: type=gha,mode=max # load: true - push: true + outputs: | + type=docker + type=registry - name: run image run: | id=$(docker create ${{ steps.prep.outputs.image }}:latest) From 4d36d2001c813c06215684d1d76bd10536c51785 Mon Sep 17 00:00:00 2001 From: Esau Date: Thu, 14 Dec 2023 15:49:07 +0000 Subject: [PATCH 042/182] asdf --- .github/workflows/test-github-artifacts.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index a4dbaef539a..d4855b487d6 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -63,10 +63,7 @@ jobs: target: test-base cache-from: type=gha cache-to: type=gha,mode=max - # load: true - outputs: | - type=docker - type=registry + push: true - name: run image run: | id=$(docker create ${{ steps.prep.outputs.image }}:latest) From e691448dc5fec5848f6006f4a97161c1a1ec427f Mon Sep 17 00:00:00 2001 From: Esau Date: Thu, 14 Dec 2023 16:04:11 +0000 Subject: [PATCH 043/182] sadf --- .github/workflows/test-github-artifacts.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index d4855b487d6..feef6229f32 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -51,7 +51,9 @@ jobs: sudo tar -xzvf dist/cargo.tar.gz -C /usr/local/cargo - name: Setup build context if: steps.cache-restore.outputs.cache-hit == 'true' - run: echo "additional-build-context=cargo=/usr/local/cargo" >> $GITHUB_ENV + run: | + echo "additional-build-context=cargo=/usr/local/cargo" >> $GITHUB_ENV' + echo "bump" - name: Build cargo uses: docker/build-push-action@v5 with: From 444d9286b70aab2c64f6e2804c81a6d4a406cfec Mon Sep 17 00:00:00 2001 From: Esau Date: Thu, 14 Dec 2023 16:05:20 +0000 Subject: [PATCH 044/182] Revert "sadf" This reverts commit e691448dc5fec5848f6006f4a97161c1a1ec427f. --- .github/workflows/test-github-artifacts.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index feef6229f32..d4855b487d6 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -51,9 +51,7 @@ jobs: sudo tar -xzvf dist/cargo.tar.gz -C /usr/local/cargo - name: Setup build context if: steps.cache-restore.outputs.cache-hit == 'true' - run: | - echo "additional-build-context=cargo=/usr/local/cargo" >> $GITHUB_ENV' - echo "bump" + run: echo "additional-build-context=cargo=/usr/local/cargo" >> $GITHUB_ENV - name: Build cargo uses: docker/build-push-action@v5 with: From dd7226f0bced3a2d33bdd162e9d50aaf460c56f0 Mon Sep 17 00:00:00 2001 From: Esau Date: Thu, 14 Dec 2023 16:16:40 +0000 Subject: [PATCH 045/182] asf --- .github/workflows/test-github-artifacts.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index d4855b487d6..0ef53fb2642 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -45,9 +45,9 @@ jobs: - name: Cache was hit if: steps.cache-restore.outputs.cache-hit == 'true' run: | - sudo mkdir -p target + # sudo mkdir -p target sudo mkdir -p /usr/local/cargo - sudo tar -xzvf dist/target.tar.gz -C target + sudo tar -xzvf dist/target.tar.gz -C ./ sudo tar -xzvf dist/cargo.tar.gz -C /usr/local/cargo - name: Setup build context if: steps.cache-restore.outputs.cache-hit == 'true' From 0f816d71b7c32f092f69bb6635234d9886590b86 Mon Sep 17 00:00:00 2001 From: Esau Date: Thu, 14 Dec 2023 16:24:23 +0000 Subject: [PATCH 046/182] build --- Dockerfile.ci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.ci b/Dockerfile.ci index 367919abe18..0d63f4a14b8 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -11,7 +11,7 @@ WORKDIR /usr/src/noir COPY --from=planner recipe.json recipe.json RUN cargo chef cook --release --recipe-path recipe.json COPY . . -# RUN cargo build --release --bin app +RUN cargo build --release --bin app # FROM rust:1-slim-bookworm as test-base # WORKDIR /usr/src/noir From 5ef9e7257f21a876eec7fdf301d2d0ed20f3ee0b Mon Sep 17 00:00:00 2001 From: Esau Date: Thu, 14 Dec 2023 16:28:34 +0000 Subject: [PATCH 047/182] asdf --- Dockerfile.ci | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile.ci b/Dockerfile.ci index 0d63f4a14b8..396aedd8284 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -11,7 +11,8 @@ WORKDIR /usr/src/noir COPY --from=planner recipe.json recipe.json RUN cargo chef cook --release --recipe-path recipe.json COPY . . -RUN cargo build --release --bin app +RUN ./scripts/bootstrap_native.sh +ENV PATH="${PATH}:/usr/src/noir/target/release/" # FROM rust:1-slim-bookworm as test-base # WORKDIR /usr/src/noir From 6e118baf0b68f20c490cb6805f33b2ec90913ba6 Mon Sep 17 00:00:00 2001 From: Esau Date: Thu, 14 Dec 2023 18:50:39 +0000 Subject: [PATCH 048/182] asdf --- .github/workflows/test-github-artifacts.yml | 36 +-------------------- Dockerfile.ci | 2 +- 2 files changed, 2 insertions(+), 36 deletions(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index 0ef53fb2642..20b39e7de83 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -36,47 +36,13 @@ jobs: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: test-cache-restore - id: cache-restore - uses: actions/cache/restore@v3 - with: - path: dist - key: noir-base-docker-artifact-cache - - name: Cache was hit - if: steps.cache-restore.outputs.cache-hit == 'true' - run: | - # sudo mkdir -p target - sudo mkdir -p /usr/local/cargo - sudo tar -xzvf dist/target.tar.gz -C ./ - sudo tar -xzvf dist/cargo.tar.gz -C /usr/local/cargo - - name: Setup build context - if: steps.cache-restore.outputs.cache-hit == 'true' - run: echo "additional-build-context=cargo=/usr/local/cargo" >> $GITHUB_ENV - name: Build cargo uses: docker/build-push-action@v5 with: context: . - build-contexts: | - ${{ env.additional-build-context }} file: Dockerfile.ci tags: ${{ steps.prep.outputs.tags }} target: test-base cache-from: type=gha cache-to: type=gha,mode=max - push: true - - name: run image - run: | - id=$(docker create ${{ steps.prep.outputs.image }}:latest) - sudo docker cp $id:/usr/src/noir/target /target - sudo docker cp $id:/usr/local/cargo /cargo - sudo docker rm -v $id - - name: tar - run: | - sudo mkdir -p dist - sudo tar -czvf dist/target.tar.gz /target - sudo tar -czvf dist/cargo.tar.gz /cargo - - name: test-cache-save - uses: actions/cache/save@v3 - with: - path: dist - key: noir-base-docker-artifact-cache \ No newline at end of file + push: true \ No newline at end of file diff --git a/Dockerfile.ci b/Dockerfile.ci index 396aedd8284..6f963035195 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1,4 +1,4 @@ -FROM rust:1-slim-bookworm as base +FROM rust:1-bookworm as base RUN apt-get update && apt-get upgrade -y && apt-get install build-essential git -y RUN cargo install cargo-chef From c38841f8235b0d5667458279d0252466dbc1ef95 Mon Sep 17 00:00:00 2001 From: Esau Date: Thu, 14 Dec 2023 19:01:46 +0000 Subject: [PATCH 049/182] test --- Dockerfile.ci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.ci b/Dockerfile.ci index 6f963035195..9fde8e27983 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1,4 +1,4 @@ -FROM rust:1-bookworm as base +FROM rust:1.71.1-bookworm as base RUN apt-get update && apt-get upgrade -y && apt-get install build-essential git -y RUN cargo install cargo-chef From 32ac7848c503f0de772532cd87a8c20679f2e94d Mon Sep 17 00:00:00 2001 From: sklppy88 Date: Fri, 15 Dec 2023 13:13:51 +0000 Subject: [PATCH 050/182] t --- Dockerfile.ci | 15 +++------------ rust-toolchain.toml | 2 +- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/Dockerfile.ci b/Dockerfile.ci index 396aedd8284..bc58911663e 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1,18 +1,9 @@ -FROM rust:1-slim-bookworm as base +FROM rust:1-bookworm as test-base RUN apt-get update && apt-get upgrade -y && apt-get install build-essential git -y -RUN cargo install cargo-chef - -FROM base AS planner -COPY . . -RUN cargo chef prepare --recipe-path recipe.json - -FROM base AS test-base WORKDIR /usr/src/noir -COPY --from=planner recipe.json recipe.json -RUN cargo chef cook --release --recipe-path recipe.json COPY . . -RUN ./scripts/bootstrap_native.sh -ENV PATH="${PATH}:/usr/src/noir/target/release/" +# RUN ./scripts/bootstrap_native.sh +# ENV PATH="${PATH}:/usr/src/noir/target/release/" # FROM rust:1-slim-bookworm as test-base # WORKDIR /usr/src/noir diff --git a/rust-toolchain.toml b/rust-toolchain.toml index b6f7edc4bde..fe2949c8458 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "1.71.1" +channel = "1.74.1" components = [ "rust-src" ] targets = [ "wasm32-unknown-unknown", "wasm32-wasi", "aarch64-apple-darwin" ] profile = "default" From ac34f674725d37ecab899d1801e15e1d3550cf1f Mon Sep 17 00:00:00 2001 From: Esau Date: Fri, 15 Dec 2023 13:39:49 +0000 Subject: [PATCH 051/182] test --- .github/workflows/test-github-artifacts.yml | 35 ++++++++++++-- Dockerfile.ci | 12 ++++- Dockerfile.ci.orig | 51 --------------------- 3 files changed, 42 insertions(+), 56 deletions(-) delete mode 100644 Dockerfile.ci.orig diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index 20b39e7de83..c8deff651e1 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -7,8 +7,8 @@ on: - 'cache-docker-artifacts' jobs: - build: - name: Test github artifacts + build-nargo: + name: Build nargo runs-on: ubuntu-latest steps: - name: Checkout code @@ -45,4 +45,33 @@ jobs: target: test-base cache-from: type=gha cache-to: type=gha,mode=max - push: true \ No newline at end of file + push: true + + test-nargo: + runs-on: ubuntu-latest + needs: [build-nargo] + name: Compile site assets + steps: + - name: Login to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: prepare docker images tags + id: prep + run: | + REGISTRY="ghcr.io" + IMG="${REGISTRY}/${{ github.repository }}" + IMAGE=$(echo "$IMG" | tr '[:upper:]' '[:lower:]') + TAGS="${IMAGE}:${{ github.sha }}" + TAGS="${TAGS},${IMAGE}:latest,${IMAGE}:v${{ steps.date.outputs.date }}" + IMAGE_REF="${IMAGE}:${{ github.sha }}" + # echo ::set-output name=tags::${TAGS} + echo "tags=$TAGS" >> $GITHUB_OUTPUT + echo "image=$IMAGE" >> $GITHUB_OUTPUT + echo "image-ref=$IMAGE_REF" >> $GITHUB_OUTPUT + - name: Run the build process with Docker + uses: addnab/docker-run-action@v3 + with: + image: ${{ steps.prep.outputs.image-ref }} diff --git a/Dockerfile.ci b/Dockerfile.ci index dc2397b99e8..a48cd4b46d4 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -2,8 +2,8 @@ FROM rust:1.71.1-bookworm as base RUN apt-get update && apt-get upgrade -y && apt-get install build-essential git -y WORKDIR /usr/src/noir COPY . . -# RUN ./scripts/bootstrap_native.sh -# ENV PATH="${PATH}:/usr/src/noir/target/release/" +RUN ./scripts/bootstrap_native.sh +ENV PATH="${PATH}:/usr/src/noir/target/release/" # FROM rust:1-slim-bookworm as test-base # WORKDIR /usr/src/noir @@ -15,6 +15,14 @@ FROM test-base as test-cargo RUN apt-get install -y curl libc++-dev RUN ./scripts/test_native.sh +FROM test-base as js-install +RUN apt-get install -y ca-certificates curl gnupg +RUN mkdir -p /etc/apt/keyrings +RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg +RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list +RUN apt-get update && apt-get install nodejs -y +RUN corepack enable + FROM test-base as test-js RUN apt-get install pkg-config libssl-dev -y RUN ./scripts/install_wasm-bindgen.sh diff --git a/Dockerfile.ci.orig b/Dockerfile.ci.orig deleted file mode 100644 index 4ae8f59b95b..00000000000 --- a/Dockerfile.ci.orig +++ /dev/null @@ -1,51 +0,0 @@ -<<<<<<< HEAD -FROM rust:1-bookworm as test-base -======= -FROM rust:1.71.1-bookworm as base ->>>>>>> c38841f8235b0d5667458279d0252466dbc1ef95 -RUN apt-get update && apt-get upgrade -y && apt-get install build-essential git -y -WORKDIR /usr/src/noir -COPY . . -# RUN ./scripts/bootstrap_native.sh -# ENV PATH="${PATH}:/usr/src/noir/target/release/" - -# FROM rust:1-slim-bookworm as test-base -# WORKDIR /usr/src/noir -# COPY . . -# # RUN ./scripts/bootstrap_native.sh -# ENV PATH="${PATH}:/usr/src/noir/target/release/" - -FROM test-base as test-cargo -RUN apt-get install -y curl libc++-dev -RUN ./scripts/test_native.sh - -FROM test-base as test-js -RUN apt-get install pkg-config libssl-dev -y -RUN ./scripts/install_wasm-bindgen.sh -RUN apt-get install -y ca-certificates curl gnupg -RUN mkdir -p /etc/apt/keyrings -RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg -RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list -RUN apt-get update && apt-get install nodejs -y -RUN corepack enable -RUN yarn --immutable -RUN apt-get install -y jq -RUN yarn build -RUN yarn workspace @noir-lang/acvm_js test -RUN npx playwright install && npx playwright install-deps -RUN yarn workspace @noir-lang/acvm_js test:browser -RUN yarn workspace @noir-lang/noirc_abi test -RUN yarn workspace @noir-lang/noirc_abi test:browser -RUN yarn workspace @noir-lang/backend_barretenberg test -RUN ./scripts/nargo_compile_noir_js_assert_lt.sh -RUN rm -rf /usr/src/noir/tooling/noir_js/test/noir_compiled_examples/assert_lt/target/debug_assert_lt.json -RUN yarn workspace @noir-lang/noir_js test -RUN yarn workspace @noir-lang/source-resolver test -RUN ./scripts/nargo_compile_wasm_fixtures.sh -RUN yarn workspace @noir-lang/noir_wasm test:node -RUN yarn workspace @noir-lang/noir_wasm test:browser -RUN ./scripts/nargo_compile_noir_codegen_assert_lt.sh -RUN rm -rf /usr/src/noir/tooling/noir_codegen/test/assert_lt/target/debug_assert_lt.json -RUN yarn workspace @noir-lang/noir_codegen test -RUN apt-get install -y libc++-dev -RUN yarn test:integration \ No newline at end of file From 6e4f1d8fffcd43aa00c4fba301adf58c259a0f18 Mon Sep 17 00:00:00 2001 From: Esau Date: Fri, 15 Dec 2023 13:44:27 +0000 Subject: [PATCH 052/182] asdf --- .github/workflows/test-github-artifacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index c8deff651e1..1374349651c 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -42,7 +42,7 @@ jobs: context: . file: Dockerfile.ci tags: ${{ steps.prep.outputs.tags }} - target: test-base + target: base cache-from: type=gha cache-to: type=gha,mode=max push: true From d6331ce270d7f61714acfcb22b8db08b078589a6 Mon Sep 17 00:00:00 2001 From: Esau Date: Fri, 15 Dec 2023 13:45:36 +0000 Subject: [PATCH 053/182] test --- Dockerfile.ci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.ci b/Dockerfile.ci index a48cd4b46d4..d995b3b4599 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1,4 +1,4 @@ -FROM rust:1.71.1-bookworm as base +FROM rust:1.71.1-bookworm-slim as base RUN apt-get update && apt-get upgrade -y && apt-get install build-essential git -y WORKDIR /usr/src/noir COPY . . From 5de0d469e6b602b846feb50b64739c17a21da30c Mon Sep 17 00:00:00 2001 From: Esau Date: Fri, 15 Dec 2023 13:47:34 +0000 Subject: [PATCH 054/182] adsf --- Dockerfile.ci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.ci b/Dockerfile.ci index d995b3b4599..933eaf72ef0 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1,4 +1,4 @@ -FROM rust:1.71.1-bookworm-slim as base +FROM rust:1.71.1-slim-bookworm as base RUN apt-get update && apt-get upgrade -y && apt-get install build-essential git -y WORKDIR /usr/src/noir COPY . . From 9956791a715bc50a62e9902bf56a2078fbfaef8d Mon Sep 17 00:00:00 2001 From: Esau Date: Fri, 15 Dec 2023 13:53:49 +0000 Subject: [PATCH 055/182] test --- rust-toolchain.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index fe2949c8458..b6f7edc4bde 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "1.74.1" +channel = "1.71.1" components = [ "rust-src" ] targets = [ "wasm32-unknown-unknown", "wasm32-wasi", "aarch64-apple-darwin" ] profile = "default" From 6d58b63bb2114c76b668302ff50043279be3146c Mon Sep 17 00:00:00 2001 From: Esau Date: Fri, 15 Dec 2023 13:58:14 +0000 Subject: [PATCH 056/182] asdf --- .github/workflows/test-github-artifacts.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index 1374349651c..decac2a6f5e 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -52,6 +52,8 @@ jobs: needs: [build-nargo] name: Compile site assets steps: + - name: Checkout + uses: actions/checkout@v4 - name: Login to GitHub Container Registry uses: docker/login-action@v3 with: From 7314db27e2fa5bc2bf0de8705b64b8a97fa6f066 Mon Sep 17 00:00:00 2001 From: Esau Date: Fri, 15 Dec 2023 14:09:21 +0000 Subject: [PATCH 057/182] asdf --- .github/workflows/test-github-artifacts.yml | 34 +++++---------------- 1 file changed, 8 insertions(+), 26 deletions(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index decac2a6f5e..4815889f93a 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -49,31 +49,13 @@ jobs: test-nargo: runs-on: ubuntu-latest + container: + image: ghcr.io/noir-lang/noir:latest + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} needs: [build-nargo] - name: Compile site assets + name: Compile site assets steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Login to GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: prepare docker images tags - id: prep - run: | - REGISTRY="ghcr.io" - IMG="${REGISTRY}/${{ github.repository }}" - IMAGE=$(echo "$IMG" | tr '[:upper:]' '[:lower:]') - TAGS="${IMAGE}:${{ github.sha }}" - TAGS="${TAGS},${IMAGE}:latest,${IMAGE}:v${{ steps.date.outputs.date }}" - IMAGE_REF="${IMAGE}:${{ github.sha }}" - # echo ::set-output name=tags::${TAGS} - echo "tags=$TAGS" >> $GITHUB_OUTPUT - echo "image=$IMAGE" >> $GITHUB_OUTPUT - echo "image-ref=$IMAGE_REF" >> $GITHUB_OUTPUT - - name: Run the build process with Docker - uses: addnab/docker-run-action@v3 - with: - image: ${{ steps.prep.outputs.image-ref }} + - name: test + run: echo hi From 741b26201c89aebe5cc9e392b5f16b7690552109 Mon Sep 17 00:00:00 2001 From: Esau Date: Fri, 15 Dec 2023 14:18:54 +0000 Subject: [PATCH 058/182] asdf --- .github/workflows/test-github-artifacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index 4815889f93a..ba8bec07f69 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -58,4 +58,4 @@ jobs: name: Compile site assets steps: - name: test - run: echo hi + run: ls From 3b16653b869a205785877c816182d3e1419ceab9 Mon Sep 17 00:00:00 2001 From: Esau Date: Fri, 15 Dec 2023 14:19:49 +0000 Subject: [PATCH 059/182] asdf --- .github/workflows/test-github-artifacts.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index ba8bec07f69..501213c35d1 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -59,3 +59,5 @@ jobs: steps: - name: test run: ls + - name: test cargo + run: ./scripts/test_native.sh \ No newline at end of file From eca4304164f77f861a008f3c7a89e8272db1769b Mon Sep 17 00:00:00 2001 From: Esau Date: Fri, 15 Dec 2023 14:23:10 +0000 Subject: [PATCH 060/182] test --- .github/workflows/test-github-artifacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index 501213c35d1..838f71bee7c 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -50,7 +50,7 @@ jobs: test-nargo: runs-on: ubuntu-latest container: - image: ghcr.io/noir-lang/noir:latest + image: ghcr.io/noir-lang/noir:${{ github.sha }} credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} From 788efbfdf26e45f5f2c31093da338642c6abddb0 Mon Sep 17 00:00:00 2001 From: Esau Date: Fri, 15 Dec 2023 14:36:38 +0000 Subject: [PATCH 061/182] asdf --- .github/workflows/test-github-artifacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index 838f71bee7c..5d70cf4c18c 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -58,6 +58,6 @@ jobs: name: Compile site assets steps: - name: test - run: ls + run: cd /usr/src/noir - name: test cargo run: ./scripts/test_native.sh \ No newline at end of file From 301261115b05a03227f7aa34ffce5461f65c88b5 Mon Sep 17 00:00:00 2001 From: Esau Date: Fri, 15 Dec 2023 14:53:35 +0000 Subject: [PATCH 062/182] asdf --- .github/workflows/test-github-artifacts.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index 5d70cf4c18c..401d7f27a98 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -58,6 +58,8 @@ jobs: name: Compile site assets steps: - name: test - run: cd /usr/src/noir + run: | + cd /usr/src/noir + ./scripts/test_native.sh - name: test cargo run: ./scripts/test_native.sh \ No newline at end of file From 2fc9528935207e1c83d61d3706ab6c34c3e00563 Mon Sep 17 00:00:00 2001 From: Esau Date: Fri, 15 Dec 2023 15:10:12 +0000 Subject: [PATCH 063/182] asdf --- scripts/test_native.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/test_native.sh b/scripts/test_native.sh index bc1c47ecf12..e15710f48d9 100755 --- a/scripts/test_native.sh +++ b/scripts/test_native.sh @@ -12,4 +12,5 @@ else export GIT_COMMIT=$(git rev-parse --verify HEAD) fi +sudo apt-get install -y curl libc++-dev cargo test --workspace --locked --release \ No newline at end of file From 722080e63f2ce7dcbe52bf93320bc3c0f15ac384 Mon Sep 17 00:00:00 2001 From: Esau Date: Fri, 15 Dec 2023 15:19:32 +0000 Subject: [PATCH 064/182] test --- .github/workflows/test-github-artifacts.yml | 4 +--- scripts/test_native.sh | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index 401d7f27a98..dc3f96a2849 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -60,6 +60,4 @@ jobs: - name: test run: | cd /usr/src/noir - ./scripts/test_native.sh - - name: test cargo - run: ./scripts/test_native.sh \ No newline at end of file + sudo ./scripts/test_native.sh \ No newline at end of file diff --git a/scripts/test_native.sh b/scripts/test_native.sh index e15710f48d9..9d7978e4179 100755 --- a/scripts/test_native.sh +++ b/scripts/test_native.sh @@ -12,5 +12,5 @@ else export GIT_COMMIT=$(git rev-parse --verify HEAD) fi -sudo apt-get install -y curl libc++-dev +apt-get install -y curl libc++-dev cargo test --workspace --locked --release \ No newline at end of file From 9e47d1f15431abfa1c4c14297e76f5306ca1735b Mon Sep 17 00:00:00 2001 From: Esau Date: Fri, 15 Dec 2023 15:36:18 +0000 Subject: [PATCH 065/182] asdf --- .github/workflows/test-github-artifacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index dc3f96a2849..1622a360fe3 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -60,4 +60,4 @@ jobs: - name: test run: | cd /usr/src/noir - sudo ./scripts/test_native.sh \ No newline at end of file + ./scripts/test_native.sh \ No newline at end of file From 578a1615e0d911bdce2283234c6410ad71bc2781 Mon Sep 17 00:00:00 2001 From: Esau Date: Fri, 15 Dec 2023 16:21:33 +0000 Subject: [PATCH 066/182] teest --- .github/workflows/test-github-artifacts.yml | 21 ++++++++++++++--- Dockerfile.ci | 26 ++++++++++++++++----- scripts/test_native.sh | 1 - 3 files changed, 38 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index 1622a360fe3..f512d30b91a 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -7,8 +7,8 @@ on: - 'cache-docker-artifacts' jobs: - build-nargo: - name: Build nargo + build-base: + name: Build base image runs-on: ubuntu-latest steps: - name: Checkout code @@ -49,12 +49,27 @@ jobs: test-nargo: runs-on: ubuntu-latest + needs: [build-base] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }} + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + name: Compile site assets + steps: + - name: test + run: | + cd /usr/src/noir + ./scripts/test_native.sh + + js-setup: + runs-on: ubuntu-latest + needs: [build-base] container: image: ghcr.io/noir-lang/noir:${{ github.sha }} credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} - needs: [build-nargo] name: Compile site assets steps: - name: test diff --git a/Dockerfile.ci b/Dockerfile.ci index 933eaf72ef0..fb0179386e9 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1,16 +1,30 @@ FROM rust:1.71.1-slim-bookworm as base RUN apt-get update && apt-get upgrade -y && apt-get install build-essential git -y + +# Required for cargo test +RUN apt-get install -y curl libc++-dev + +# Required for js +RUN apt-get install -y ca-certificates curl gnupg +RUN mkdir -p /etc/apt/keyrings +RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg +RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list +RUN apt-get update && apt-get install nodejs -y +RUN corepack enable + +#Required for wasm bindgen +RUN ./scripts/install_wasm-bindgen-new.sh + +#Required for yarn building +RUN yarn --immutable +RUN apt-get install -y jq +RUN yarn build + WORKDIR /usr/src/noir COPY . . RUN ./scripts/bootstrap_native.sh ENV PATH="${PATH}:/usr/src/noir/target/release/" -# FROM rust:1-slim-bookworm as test-base -# WORKDIR /usr/src/noir -# COPY . . -# # RUN ./scripts/bootstrap_native.sh -# ENV PATH="${PATH}:/usr/src/noir/target/release/" - FROM test-base as test-cargo RUN apt-get install -y curl libc++-dev RUN ./scripts/test_native.sh diff --git a/scripts/test_native.sh b/scripts/test_native.sh index 9d7978e4179..bc1c47ecf12 100755 --- a/scripts/test_native.sh +++ b/scripts/test_native.sh @@ -12,5 +12,4 @@ else export GIT_COMMIT=$(git rev-parse --verify HEAD) fi -apt-get install -y curl libc++-dev cargo test --workspace --locked --release \ No newline at end of file From ef2e6972cfa770512b79f3d1b3bd8db47d47610e Mon Sep 17 00:00:00 2001 From: Esau Date: Fri, 15 Dec 2023 16:27:00 +0000 Subject: [PATCH 067/182] asdf --- Dockerfile.ci | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Dockerfile.ci b/Dockerfile.ci index fb0179386e9..6c057d2efa4 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -13,18 +13,20 @@ RUN apt-get update && apt-get install nodejs -y RUN corepack enable #Required for wasm bindgen +WORKDIR /usr/src/noir +COPY ./scripts/install_wasm-bindgen-new.sh ./scripts/install_wasm-bindgen-new.sh RUN ./scripts/install_wasm-bindgen-new.sh +#Required to build +COPY . . +RUN ./scripts/bootstrap_native.sh +ENV PATH="${PATH}:/usr/src/noir/target/release/" + #Required for yarn building RUN yarn --immutable RUN apt-get install -y jq RUN yarn build -WORKDIR /usr/src/noir -COPY . . -RUN ./scripts/bootstrap_native.sh -ENV PATH="${PATH}:/usr/src/noir/target/release/" - FROM test-base as test-cargo RUN apt-get install -y curl libc++-dev RUN ./scripts/test_native.sh From 05abfab749d1227ef79930683a58485f09630804 Mon Sep 17 00:00:00 2001 From: Esau Date: Fri, 15 Dec 2023 16:28:17 +0000 Subject: [PATCH 068/182] asdf --- scripts/install_wasm-bindgen-new.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 scripts/install_wasm-bindgen-new.sh diff --git a/scripts/install_wasm-bindgen-new.sh b/scripts/install_wasm-bindgen-new.sh old mode 100644 new mode 100755 From 8bf318c6e808b483fc42d537fef238966d6a0ac7 Mon Sep 17 00:00:00 2001 From: Esau Date: Fri, 15 Dec 2023 16:37:34 +0000 Subject: [PATCH 069/182] asdf --- scripts/install_wasm-bindgen-new.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install_wasm-bindgen-new.sh b/scripts/install_wasm-bindgen-new.sh index 8bd53ab1d08..b3177282894 100755 --- a/scripts/install_wasm-bindgen-new.sh +++ b/scripts/install_wasm-bindgen-new.sh @@ -1,4 +1,4 @@ #!/bin/bash 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-bindgen-cli --version 0.2.86 +cargo-binstall wasm-bindgen-cli --version 0.2.86 -y From e087f1762b8fe266272cb67255651c57f87c9a85 Mon Sep 17 00:00:00 2001 From: Esau Date: Fri, 15 Dec 2023 16:41:26 +0000 Subject: [PATCH 070/182] asdf --- .github/workflows/test-github-artifacts.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index f512d30b91a..6bf0a20c470 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -62,7 +62,8 @@ jobs: cd /usr/src/noir ./scripts/test_native.sh - js-setup: + test-acvm-js: + name: test acvm js runs-on: ubuntu-latest needs: [build-base] container: @@ -70,9 +71,8 @@ jobs: credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} - name: Compile site assets steps: - name: test run: | cd /usr/src/noir - ./scripts/test_native.sh \ No newline at end of file + yarn workspace @noir-lang/acvm_js test \ No newline at end of file From 16a81bd077c3f5519cf98624928bda3ac772a5c6 Mon Sep 17 00:00:00 2001 From: Esau Date: Fri, 15 Dec 2023 16:54:13 +0000 Subject: [PATCH 071/182] sadf --- .github/workflows/test-github-artifacts.yml | 19 ++++++++++++++++++- Dockerfile.ci | 2 +- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index 6bf0a20c470..479c26d03d9 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -75,4 +75,21 @@ jobs: - name: test run: | cd /usr/src/noir - yarn workspace @noir-lang/acvm_js test \ No newline at end of file + yarn workspace @noir-lang/acvm_js build + yarn workspace @noir-lang/acvm_js test + + test-noirc-abi: + name: test noirc abi + runs-on: ubuntu-latest + needs: [build-base] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }} + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: test + run: | + cd /usr/src/noir + yarn workspace @noir-lang/noirc_abi build + yarn workspace @noir-lang/noirc_abi test \ No newline at end of file diff --git a/Dockerfile.ci b/Dockerfile.ci index 6c057d2efa4..2efd2f8f100 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -25,7 +25,7 @@ ENV PATH="${PATH}:/usr/src/noir/target/release/" #Required for yarn building RUN yarn --immutable RUN apt-get install -y jq -RUN yarn build +# RUN yarn build FROM test-base as test-cargo RUN apt-get install -y curl libc++-dev From f27468352778751c48dc7aea3bf0bf46b4cfd762 Mon Sep 17 00:00:00 2001 From: Esau Date: Fri, 15 Dec 2023 16:59:23 +0000 Subject: [PATCH 072/182] asdf --- .github/workflows/test-github-artifacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index 479c26d03d9..f59e694a97a 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -48,6 +48,7 @@ jobs: push: true test-nargo: + name: test cargo runs-on: ubuntu-latest needs: [build-base] container: @@ -55,7 +56,6 @@ jobs: credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} - name: Compile site assets steps: - name: test run: | From 296e094901a0fa7ebf7c29e824e39348a298aca4 Mon Sep 17 00:00:00 2001 From: Esau Date: Sat, 16 Dec 2023 16:35:29 +0000 Subject: [PATCH 073/182] asdf --- .dockerignore | 32 ++++----- .github/workflows/docker-test-flow.yml | 95 ++++++++++++++++++++++++++ Dockerfile.ci | 3 + Dockerfile.ci.dockerignore | 22 ------ 4 files changed, 114 insertions(+), 38 deletions(-) create mode 100644 .github/workflows/docker-test-flow.yml delete mode 100644 Dockerfile.ci.dockerignore diff --git a/.dockerignore b/.dockerignore index 9aad28ddfe0..25dd24f015c 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,22 +1,22 @@ Dockerfile* .dockerignore -# packages -# **/package.tgz -# **/target -# **/node_modules -# **/outputs +packages +**/package.tgz +**/target +**/node_modules +**/outputs -# # Source resolver -# compiler/source-resolver/lib -# compiler/source-resolver/lib-node +# Source resolver +compiler/source-resolver/lib +compiler/source-resolver/lib-node -# # Noir.js -# tooling/noir_js/lib +# Noir.js +tooling/noir_js/lib -# # Wasm build artifacts -# compiler/wasm/nodejs -# compiler/wasm/web -# tooling/noirc_abi_wasm/nodejs -# tooling/noirc_abi_wasm/web -# tooling/noir_js/lib \ No newline at end of file +# Wasm build artifacts +compiler/wasm/nodejs +compiler/wasm/web +tooling/noirc_abi_wasm/nodejs +tooling/noirc_abi_wasm/web +tooling/noir_js/lib \ No newline at end of file diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml new file mode 100644 index 00000000000..8604b00939c --- /dev/null +++ b/.github/workflows/docker-test-flow.yml @@ -0,0 +1,95 @@ +name: Test github artifacts + +on: + push: + branches: + # - 'master' + - 'cache-docker-artifacts' + +jobs: + build-base: + name: Build base image + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v4 + - name: Get current date + id: date + run: echo "date=$(date +'%Y.%m.%d.%H.%M')" >> $GITHUB_STATE + - name: prepare docker images tags + id: prep + run: | + REGISTRY="ghcr.io" + IMG="${REGISTRY}/${{ github.repository }}" + IMAGE=$(echo "$IMG" | tr '[:upper:]' '[:lower:]') + TAGS="${IMAGE}:${{ github.sha }}" + TAGS="${TAGS},${IMAGE}:latest,${IMAGE}:v${{ steps.date.outputs.date }}" + # echo ::set-output name=tags::${TAGS} + echo "tags=$TAGS" >> $GITHUB_OUTPUT + echo "image=$IMAGE" >> $GITHUB_OUTPUT + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@v3 + - name: Login to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Build cargo + uses: docker/build-push-action@v5 + with: + context: . + file: Dockerfile.ci + tags: ${{ steps.prep.outputs.tags }} + target: base + cache-from: type=gha + cache-to: type=gha,mode=max + push: true + + # test-nargo: + # name: test cargo + # runs-on: ubuntu-latest + # needs: [build-base] + # container: + # image: ghcr.io/noir-lang/noir:${{ github.sha }} + # credentials: + # username: ${{ github.actor }} + # password: ${{ secrets.github_token }} + # steps: + # - name: test + # run: | + # cd /usr/src/noir + # ./scripts/test_native.sh + + test-acvm-js: + name: test acvm js + runs-on: ubuntu-latest + needs: [build-base] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }} + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: test + run: | + cd /usr/src/noir + yarn workspace @noir-lang/acvm_js build + yarn workspace @noir-lang/acvm_js test + + # test-noirc-abi: + # name: test noirc abi + # runs-on: ubuntu-latest + # needs: [build-base] + # container: + # image: ghcr.io/noir-lang/noir:${{ github.sha }} + # credentials: + # username: ${{ github.actor }} + # password: ${{ secrets.github_token }} + # steps: + # - name: test + # run: | + # cd /usr/src/noir + # yarn workspace @noir-lang/noirc_abi build + # yarn workspace @noir-lang/noirc_abi test \ No newline at end of file diff --git a/Dockerfile.ci b/Dockerfile.ci index 2efd2f8f100..689faf0406e 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1,6 +1,9 @@ FROM rust:1.71.1-slim-bookworm as base RUN apt-get update && apt-get upgrade -y && apt-get install build-essential git -y +WORKDIR /usr/src/noir +COPY . . +FROM base as intermediate # Required for cargo test RUN apt-get install -y curl libc++-dev diff --git a/Dockerfile.ci.dockerignore b/Dockerfile.ci.dockerignore deleted file mode 100644 index 4bed62faf98..00000000000 --- a/Dockerfile.ci.dockerignore +++ /dev/null @@ -1,22 +0,0 @@ -Dockerfile* -# .dockerignore - -# packages -# **/package.tgz -# **/target -# **/node_modules -# **/outputs - -# # Source resolver -# compiler/source-resolver/lib -# compiler/source-resolver/lib-node - -# # Noir.js -# tooling/noir_js/lib - -# # Wasm build artifacts -# compiler/wasm/nodejs -# compiler/wasm/web -# tooling/noirc_abi_wasm/nodejs -# tooling/noirc_abi_wasm/web -# tooling/noir_js/lib \ No newline at end of file From e4c5cd820db0e81957a7f788a019697744b497fb Mon Sep 17 00:00:00 2001 From: Esau Date: Sat, 16 Dec 2023 16:37:39 +0000 Subject: [PATCH 074/182] asdf --- .github/workflows/test-github-artifacts.yml | 180 ++++++++++---------- 1 file changed, 90 insertions(+), 90 deletions(-) diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml index f59e694a97a..c86e6895483 100644 --- a/.github/workflows/test-github-artifacts.yml +++ b/.github/workflows/test-github-artifacts.yml @@ -1,95 +1,95 @@ -name: Test github artifacts +# name: Test github artifacts -on: - push: - branches: - # - 'master' - - 'cache-docker-artifacts' +# on: +# push: +# branches: +# # - 'master' +# - 'cache-docker-artifacts' -jobs: - build-base: - name: Build base image - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v4 - - name: Get current date - id: date - run: echo "date=$(date +'%Y.%m.%d.%H.%M')" >> $GITHUB_STATE - - name: prepare docker images tags - id: prep - run: | - REGISTRY="ghcr.io" - IMG="${REGISTRY}/${{ github.repository }}" - IMAGE=$(echo "$IMG" | tr '[:upper:]' '[:lower:]') - TAGS="${IMAGE}:${{ github.sha }}" - TAGS="${TAGS},${IMAGE}:latest,${IMAGE}:v${{ steps.date.outputs.date }}" - # echo ::set-output name=tags::${TAGS} - echo "tags=$TAGS" >> $GITHUB_OUTPUT - echo "image=$IMAGE" >> $GITHUB_OUTPUT - - name: Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@v3 - - name: Login to GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: Build cargo - uses: docker/build-push-action@v5 - with: - context: . - file: Dockerfile.ci - tags: ${{ steps.prep.outputs.tags }} - target: base - cache-from: type=gha - cache-to: type=gha,mode=max - push: true +# jobs: +# build-base: +# name: Build base image +# runs-on: ubuntu-latest +# steps: +# - name: Checkout code +# uses: actions/checkout@v4 +# - name: Get current date +# id: date +# run: echo "date=$(date +'%Y.%m.%d.%H.%M')" >> $GITHUB_STATE +# - name: prepare docker images tags +# id: prep +# run: | +# REGISTRY="ghcr.io" +# IMG="${REGISTRY}/${{ github.repository }}" +# IMAGE=$(echo "$IMG" | tr '[:upper:]' '[:lower:]') +# TAGS="${IMAGE}:${{ github.sha }}" +# TAGS="${TAGS},${IMAGE}:latest,${IMAGE}:v${{ steps.date.outputs.date }}" +# # echo ::set-output name=tags::${TAGS} +# echo "tags=$TAGS" >> $GITHUB_OUTPUT +# echo "image=$IMAGE" >> $GITHUB_OUTPUT +# - name: Set up Docker Buildx +# id: buildx +# uses: docker/setup-buildx-action@v3 +# - name: Login to GitHub Container Registry +# uses: docker/login-action@v3 +# with: +# registry: ghcr.io +# username: ${{ github.actor }} +# password: ${{ secrets.GITHUB_TOKEN }} +# - name: Build cargo +# uses: docker/build-push-action@v5 +# with: +# context: . +# file: Dockerfile.ci +# tags: ${{ steps.prep.outputs.tags }} +# target: base +# cache-from: type=gha +# cache-to: type=gha,mode=max +# push: true - test-nargo: - name: test cargo - runs-on: ubuntu-latest - needs: [build-base] - container: - image: ghcr.io/noir-lang/noir:${{ github.sha }} - credentials: - username: ${{ github.actor }} - password: ${{ secrets.github_token }} - steps: - - name: test - run: | - cd /usr/src/noir - ./scripts/test_native.sh +# test-nargo: +# name: test cargo +# runs-on: ubuntu-latest +# needs: [build-base] +# container: +# image: ghcr.io/noir-lang/noir:${{ github.sha }} +# credentials: +# username: ${{ github.actor }} +# password: ${{ secrets.github_token }} +# steps: +# - name: test +# run: | +# cd /usr/src/noir +# ./scripts/test_native.sh - test-acvm-js: - name: test acvm js - runs-on: ubuntu-latest - needs: [build-base] - container: - image: ghcr.io/noir-lang/noir:${{ github.sha }} - credentials: - username: ${{ github.actor }} - password: ${{ secrets.github_token }} - steps: - - name: test - run: | - cd /usr/src/noir - yarn workspace @noir-lang/acvm_js build - yarn workspace @noir-lang/acvm_js test +# test-acvm-js: +# name: test acvm js +# runs-on: ubuntu-latest +# needs: [build-base] +# container: +# image: ghcr.io/noir-lang/noir:${{ github.sha }} +# credentials: +# username: ${{ github.actor }} +# password: ${{ secrets.github_token }} +# steps: +# - name: test +# run: | +# cd /usr/src/noir +# yarn workspace @noir-lang/acvm_js build +# yarn workspace @noir-lang/acvm_js test - test-noirc-abi: - name: test noirc abi - runs-on: ubuntu-latest - needs: [build-base] - container: - image: ghcr.io/noir-lang/noir:${{ github.sha }} - credentials: - username: ${{ github.actor }} - password: ${{ secrets.github_token }} - steps: - - name: test - run: | - cd /usr/src/noir - yarn workspace @noir-lang/noirc_abi build - yarn workspace @noir-lang/noirc_abi test \ No newline at end of file +# test-noirc-abi: +# name: test noirc abi +# runs-on: ubuntu-latest +# needs: [build-base] +# container: +# image: ghcr.io/noir-lang/noir:${{ github.sha }} +# credentials: +# username: ${{ github.actor }} +# password: ${{ secrets.github_token }} +# steps: +# - name: test +# run: | +# cd /usr/src/noir +# yarn workspace @noir-lang/noirc_abi build +# yarn workspace @noir-lang/noirc_abi test \ No newline at end of file From 378bc1a12c3e9e62ed38f1219a5467518086baec Mon Sep 17 00:00:00 2001 From: Esau Date: Sat, 16 Dec 2023 16:43:37 +0000 Subject: [PATCH 075/182] asdf --- Dockerfile.ci | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Dockerfile.ci b/Dockerfile.ci index 689faf0406e..8b9fec77d9e 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1,5 +1,17 @@ -FROM rust:1.71.1-slim-bookworm as base +FROM rust:1.71.1-slim-bookworm as base-base RUN apt-get update && apt-get upgrade -y && apt-get install build-essential git -y + +FROM base-base as js-base +RUN apt-get install -y ca-certificates curl gnupg +RUN mkdir -p /etc/apt/keyrings +RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg +RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list +RUN apt-get update && apt-get install nodejs -y +RUN corepack enable +WORKDIR /usr/src/noir +COPY . . + +FROM base-base as base WORKDIR /usr/src/noir COPY . . From f90bd1a8643de9727a5a2173d2a79609c7cecac2 Mon Sep 17 00:00:00 2001 From: Esau Date: Sat, 16 Dec 2023 16:50:05 +0000 Subject: [PATCH 076/182] asdf --- .github/workflows/docker-test-flow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 8604b00939c..11a298f944f 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -42,7 +42,7 @@ jobs: context: . file: Dockerfile.ci tags: ${{ steps.prep.outputs.tags }} - target: base + target: js-base cache-from: type=gha cache-to: type=gha,mode=max push: true From c88dfd70df9ce650bbcdffe9ed6edfc5dea431ea Mon Sep 17 00:00:00 2001 From: Esau Date: Mon, 18 Dec 2023 19:52:23 +0100 Subject: [PATCH 077/182] add yarn --- Dockerfile.ci | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile.ci b/Dockerfile.ci index 8b9fec77d9e..2381a0d3e07 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -9,6 +9,8 @@ RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesourc RUN apt-get update && apt-get install nodejs -y RUN corepack enable WORKDIR /usr/src/noir +COPY ./yarn.lock ./yarn.lock +RUN yarn --immutable COPY . . FROM base-base as base From 28ff43b4c9f0e5e026af92a2d8baa993be0cef35 Mon Sep 17 00:00:00 2001 From: Esau Date: Mon, 18 Dec 2023 19:57:41 +0100 Subject: [PATCH 078/182] d --- Dockerfile.ci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.ci b/Dockerfile.ci index 2381a0d3e07..9080955faec 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -9,7 +9,7 @@ RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesourc RUN apt-get update && apt-get install nodejs -y RUN corepack enable WORKDIR /usr/src/noir -COPY ./yarn.lock ./yarn.lock +COPY yarn.lock package.json ./ RUN yarn --immutable COPY . . From e28f4d04c29a04258706890f24948c50b3011786 Mon Sep 17 00:00:00 2001 From: Esau Date: Mon, 18 Dec 2023 20:16:46 +0100 Subject: [PATCH 079/182] asdf --- .dockerignore | 9 +++++++++ Dockerfile.ci | 6 ++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.dockerignore b/.dockerignore index 25dd24f015c..6e8a519a0a5 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,6 +1,15 @@ Dockerfile* .dockerignore +# Yarn +.pnp.* +.yarn/* +!.yarn/patches +!.yarn/plugins +!.yarn/releases +!.yarn/sdks +!.yarn/versions + packages **/package.tgz **/target diff --git a/Dockerfile.ci b/Dockerfile.ci index 9080955faec..4ac6d634f85 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -9,8 +9,10 @@ RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesourc RUN apt-get update && apt-get install nodejs -y RUN corepack enable WORKDIR /usr/src/noir -COPY yarn.lock package.json ./ -RUN yarn --immutable +COPY yarn.lock package.json .yarnrc.yml ./ +COPY .yarn/ ./.yarn/ +# RUN yarn --immutable +RUN yarn COPY . . FROM base-base as base From bb953a2059b58782c15fb7b354d154768ddea5fa Mon Sep 17 00:00:00 2001 From: Esau Date: Mon, 18 Dec 2023 20:19:54 +0100 Subject: [PATCH 080/182] asdf --- .github/workflows/docker-test-flow.yml | 1 + .github/workflows/test-github-artifacts.yml | 95 --------------------- 2 files changed, 1 insertion(+), 95 deletions(-) delete mode 100644 .github/workflows/test-github-artifacts.yml diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 11a298f944f..95c6573cf74 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -75,6 +75,7 @@ jobs: - name: test run: | cd /usr/src/noir + apt-get install -y jq yarn workspace @noir-lang/acvm_js build yarn workspace @noir-lang/acvm_js test diff --git a/.github/workflows/test-github-artifacts.yml b/.github/workflows/test-github-artifacts.yml deleted file mode 100644 index c86e6895483..00000000000 --- a/.github/workflows/test-github-artifacts.yml +++ /dev/null @@ -1,95 +0,0 @@ -# name: Test github artifacts - -# on: -# push: -# branches: -# # - 'master' -# - 'cache-docker-artifacts' - -# jobs: -# build-base: -# name: Build base image -# runs-on: ubuntu-latest -# steps: -# - name: Checkout code -# uses: actions/checkout@v4 -# - name: Get current date -# id: date -# run: echo "date=$(date +'%Y.%m.%d.%H.%M')" >> $GITHUB_STATE -# - name: prepare docker images tags -# id: prep -# run: | -# REGISTRY="ghcr.io" -# IMG="${REGISTRY}/${{ github.repository }}" -# IMAGE=$(echo "$IMG" | tr '[:upper:]' '[:lower:]') -# TAGS="${IMAGE}:${{ github.sha }}" -# TAGS="${TAGS},${IMAGE}:latest,${IMAGE}:v${{ steps.date.outputs.date }}" -# # echo ::set-output name=tags::${TAGS} -# echo "tags=$TAGS" >> $GITHUB_OUTPUT -# echo "image=$IMAGE" >> $GITHUB_OUTPUT -# - name: Set up Docker Buildx -# id: buildx -# uses: docker/setup-buildx-action@v3 -# - name: Login to GitHub Container Registry -# uses: docker/login-action@v3 -# with: -# registry: ghcr.io -# username: ${{ github.actor }} -# password: ${{ secrets.GITHUB_TOKEN }} -# - name: Build cargo -# uses: docker/build-push-action@v5 -# with: -# context: . -# file: Dockerfile.ci -# tags: ${{ steps.prep.outputs.tags }} -# target: base -# cache-from: type=gha -# cache-to: type=gha,mode=max -# push: true - -# test-nargo: -# name: test cargo -# runs-on: ubuntu-latest -# needs: [build-base] -# container: -# image: ghcr.io/noir-lang/noir:${{ github.sha }} -# credentials: -# username: ${{ github.actor }} -# password: ${{ secrets.github_token }} -# steps: -# - name: test -# run: | -# cd /usr/src/noir -# ./scripts/test_native.sh - -# test-acvm-js: -# name: test acvm js -# runs-on: ubuntu-latest -# needs: [build-base] -# container: -# image: ghcr.io/noir-lang/noir:${{ github.sha }} -# credentials: -# username: ${{ github.actor }} -# password: ${{ secrets.github_token }} -# steps: -# - name: test -# run: | -# cd /usr/src/noir -# yarn workspace @noir-lang/acvm_js build -# yarn workspace @noir-lang/acvm_js test - -# test-noirc-abi: -# name: test noirc abi -# runs-on: ubuntu-latest -# needs: [build-base] -# container: -# image: ghcr.io/noir-lang/noir:${{ github.sha }} -# credentials: -# username: ${{ github.actor }} -# password: ${{ secrets.github_token }} -# steps: -# - name: test -# run: | -# cd /usr/src/noir -# yarn workspace @noir-lang/noirc_abi build -# yarn workspace @noir-lang/noirc_abi test \ No newline at end of file From 16512454f53fd6b774f94d91c0449675a3d77258 Mon Sep 17 00:00:00 2001 From: Esau Date: Mon, 18 Dec 2023 20:22:04 +0100 Subject: [PATCH 081/182] asdf --- .github/scripts/test-acvm-js.sh | 7 +++++++ .github/workflows/docker-test-flow.yml | 5 +---- 2 files changed, 8 insertions(+), 4 deletions(-) create mode 100755 .github/scripts/test-acvm-js.sh diff --git a/.github/scripts/test-acvm-js.sh b/.github/scripts/test-acvm-js.sh new file mode 100755 index 00000000000..920d9534a39 --- /dev/null +++ b/.github/scripts/test-acvm-js.sh @@ -0,0 +1,7 @@ +#!/bin/bash +set -eu + +cd /usr/src/noir +apt-get install -y jq +yarn workspace @noir-lang/acvm_js build +yarn workspace @noir-lang/acvm_js test \ No newline at end of file diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 95c6573cf74..1017c8a4093 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -74,10 +74,7 @@ jobs: steps: - name: test run: | - cd /usr/src/noir - apt-get install -y jq - yarn workspace @noir-lang/acvm_js build - yarn workspace @noir-lang/acvm_js test + ./.github/scripts/test-acvm-js.sh # test-noirc-abi: # name: test noirc abi From aa0c175ef1440d74ff67309133f9677870226712 Mon Sep 17 00:00:00 2001 From: Esau Date: Mon, 18 Dec 2023 20:39:05 +0100 Subject: [PATCH 082/182] asdf --- .github/workflows/docker-test-flow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 1017c8a4093..8e9f0ff1612 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -74,7 +74,7 @@ jobs: steps: - name: test run: | - ./.github/scripts/test-acvm-js.sh + /usr/src/noir/.github/scripts/test-acvm-js.sh # test-noirc-abi: # name: test noirc abi From bd9549dd12fe7dc54ead5024b731e07b2d8a2e5c Mon Sep 17 00:00:00 2001 From: Esau Date: Mon, 18 Dec 2023 20:42:54 +0100 Subject: [PATCH 083/182] asdf --- .github/scripts/test-acvm-js.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/scripts/test-acvm-js.sh b/.github/scripts/test-acvm-js.sh index 920d9534a39..85d1bcbf6ea 100755 --- a/.github/scripts/test-acvm-js.sh +++ b/.github/scripts/test-acvm-js.sh @@ -2,6 +2,7 @@ set -eu cd /usr/src/noir +./scripts/install_wasm-bindgen-new.sh apt-get install -y jq yarn workspace @noir-lang/acvm_js build yarn workspace @noir-lang/acvm_js test \ No newline at end of file From b2333fb72e9e5d8c8235dccde9fbe5d684af34e9 Mon Sep 17 00:00:00 2001 From: Esau Date: Mon, 18 Dec 2023 20:56:24 +0100 Subject: [PATCH 084/182] asdf --- Dockerfile.ci | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile.ci b/Dockerfile.ci index 4ac6d634f85..634ef385a11 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -13,6 +13,7 @@ COPY yarn.lock package.json .yarnrc.yml ./ COPY .yarn/ ./.yarn/ # RUN yarn --immutable RUN yarn +RUN yarn --immutable COPY . . FROM base-base as base From 9d760c132b1bf8721ccd269a3444250e594e4564 Mon Sep 17 00:00:00 2001 From: Esau Date: Mon, 18 Dec 2023 21:32:59 +0100 Subject: [PATCH 085/182] test --- .github/scripts/test-acvm-js.sh | 5 +++-- .github/scripts/test-noirc-abi.sh | 9 +++++++++ .github/workflows/docker-test-flow.yml | 14 ++++++++++++++ Dockerfile.ci | 7 +++++-- 4 files changed, 31 insertions(+), 4 deletions(-) create mode 100755 .github/scripts/test-noirc-abi.sh diff --git a/.github/scripts/test-acvm-js.sh b/.github/scripts/test-acvm-js.sh index 85d1bcbf6ea..d78be25c400 100755 --- a/.github/scripts/test-acvm-js.sh +++ b/.github/scripts/test-acvm-js.sh @@ -3,6 +3,7 @@ set -eu cd /usr/src/noir ./scripts/install_wasm-bindgen-new.sh -apt-get install -y jq yarn workspace @noir-lang/acvm_js build -yarn workspace @noir-lang/acvm_js test \ No newline at end of file +yarn workspace @noir-lang/acvm_js test +npx playwright install && npx playwright install-deps +yarn workspace @noir-lang/acvm_js test:browser diff --git a/.github/scripts/test-noirc-abi.sh b/.github/scripts/test-noirc-abi.sh new file mode 100755 index 00000000000..6461741f25d --- /dev/null +++ b/.github/scripts/test-noirc-abi.sh @@ -0,0 +1,9 @@ +#!/bin/bash +set -eu + +cd /usr/src/noir +./scripts/install_wasm-bindgen-new.sh +yarn workspace @noir-lang/noirc_abi build +yarn workspace @noir-lang/noirc_abi test +npx playwright install && npx playwright install-deps +yarn workspace @noir-lang/noirc_abi test:browser diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 8e9f0ff1612..cf292ca1342 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -76,6 +76,20 @@ jobs: run: | /usr/src/noir/.github/scripts/test-acvm-js.sh + test-noirc-abi: + name: test noirc abi + runs-on: ubuntu-latest + needs: [build-base] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }} + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: test + run: | + /usr/src/noir/.github/scripts/test-noirc-abi.sh + # test-noirc-abi: # name: test noirc abi # runs-on: ubuntu-latest diff --git a/Dockerfile.ci b/Dockerfile.ci index 634ef385a11..8a34d529c22 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -9,11 +9,14 @@ RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesourc RUN apt-get update && apt-get install nodejs -y RUN corepack enable WORKDIR /usr/src/noir +RUN apt-get install -y jq COPY yarn.lock package.json .yarnrc.yml ./ COPY .yarn/ ./.yarn/ -# RUN yarn --immutable +# acvm-js +COPY ./acvm-repo/acvm_js/package.json ./acvm-repo/acvm_js/ +COPY ./tooling/noirc_abi_wasm/package.json ./tooling/noirc_abi_wasm/ RUN yarn -RUN yarn --immutable +# RUN yarn --immutable COPY . . FROM base-base as base From c91edc1c97abcbeb3b455e411fefc689573d2831 Mon Sep 17 00:00:00 2001 From: Esau Date: Mon, 18 Dec 2023 21:46:21 +0100 Subject: [PATCH 086/182] add --- .github/scripts/test-noir-wasm.sh | 9 +++++++++ .github/workflows/docker-test-flow.yml | 14 ++++++++++++++ 2 files changed, 23 insertions(+) create mode 100755 .github/scripts/test-noir-wasm.sh diff --git a/.github/scripts/test-noir-wasm.sh b/.github/scripts/test-noir-wasm.sh new file mode 100755 index 00000000000..dfd67d09df4 --- /dev/null +++ b/.github/scripts/test-noir-wasm.sh @@ -0,0 +1,9 @@ +#!/bin/bash +set -eu + +cd /usr/src/noir +./scripts/install_wasm-bindgen-new.sh +yarn workspace @noir-lang/noir_wasm build +yarn workspace @noir-lang/noir_wasm test:node +npx playwright install && npx playwright install-deps +yarn workspace @noir-lang/noir_wasm test:browser diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index cf292ca1342..4bb68452c05 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -62,6 +62,20 @@ jobs: # cd /usr/src/noir # ./scripts/test_native.sh + test-noir-wasm: + name: test noir wasm + runs-on: ubuntu-latest + needs: [build-base] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }} + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: test + run: | + /usr/src/noir/.github/scripts/test-noir-wasm.sh + test-acvm-js: name: test acvm js runs-on: ubuntu-latest From 7625503032eefb1eab0cec5380a20f84148f24e8 Mon Sep 17 00:00:00 2001 From: Esau Date: Mon, 18 Dec 2023 22:50:14 +0100 Subject: [PATCH 087/182] asdf --- .github/scripts/test-nargo.sh | 11 +++ .github/scripts/test-noir-wasm.sh | 1 + .github/scripts/test-source-resolver.sh | 6 ++ .github/workflows/docker-test-flow.yml | 120 +++++++++++++++--------- Dockerfile.ci | 14 ++- 5 files changed, 107 insertions(+), 45 deletions(-) create mode 100755 .github/scripts/test-nargo.sh create mode 100755 .github/scripts/test-source-resolver.sh diff --git a/.github/scripts/test-nargo.sh b/.github/scripts/test-nargo.sh new file mode 100755 index 00000000000..292f52750b8 --- /dev/null +++ b/.github/scripts/test-nargo.sh @@ -0,0 +1,11 @@ +#!/bin/bash +set -eu + +cd /usr/src/noir +apt-get install -y curl libc++-dev + +export SOURCE_DATE_EPOCH=$(date +%s) +export GIT_DIRTY=false +export GIT_COMMIT=$(git rev-parse --verify HEAD) + +cargo test --workspace --locked --release \ No newline at end of file diff --git a/.github/scripts/test-noir-wasm.sh b/.github/scripts/test-noir-wasm.sh index dfd67d09df4..8aa17a38baa 100755 --- a/.github/scripts/test-noir-wasm.sh +++ b/.github/scripts/test-noir-wasm.sh @@ -4,6 +4,7 @@ set -eu cd /usr/src/noir ./scripts/install_wasm-bindgen-new.sh yarn workspace @noir-lang/noir_wasm build +./scripts/nargo_compile_wasm_fixtures.sh yarn workspace @noir-lang/noir_wasm test:node npx playwright install && npx playwright install-deps yarn workspace @noir-lang/noir_wasm test:browser diff --git a/.github/scripts/test-source-resolver.sh b/.github/scripts/test-source-resolver.sh new file mode 100755 index 00000000000..31164759ec8 --- /dev/null +++ b/.github/scripts/test-source-resolver.sh @@ -0,0 +1,6 @@ +#!/bin/bash +set -eu + +cd /usr/src/noir +yarn workspace @noir-lang/source-resolver build +yarn workspace @noir-lang/source-resolver test diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 4bb68452c05..4f0a0caa381 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -7,8 +7,8 @@ on: - 'cache-docker-artifacts' jobs: - build-base: - name: Build base image + build-base-js: + name: Build base js image runs-on: ubuntu-latest steps: - name: Checkout code @@ -22,8 +22,47 @@ jobs: REGISTRY="ghcr.io" IMG="${REGISTRY}/${{ github.repository }}" IMAGE=$(echo "$IMG" | tr '[:upper:]' '[:lower:]') - TAGS="${IMAGE}:${{ github.sha }}" - TAGS="${TAGS},${IMAGE}:latest,${IMAGE}:v${{ steps.date.outputs.date }}" + TAGS="${IMAGE}:${{ github.sha }}:js" + TAGS="${TAGS},${IMAGE}:latest:js,${IMAGE}:v${{ steps.date.outputs.date }}:js" + echo "tags=$TAGS" >> $GITHUB_OUTPUT + echo "image=$IMAGE" >> $GITHUB_OUTPUT + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@v3 + - name: Login to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Build cargo + uses: docker/build-push-action@v5 + with: + context: . + file: Dockerfile.ci + tags: ${{ steps.prep.outputs.tags }} + target: base-js + cache-from: type=gha + cache-to: type=gha,mode=max + push: true + + build-base-nargo: + name: Build base nargo + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v4 + - name: Get current date + id: date + run: echo "date=$(date +'%Y.%m.%d.%H.%M')" >> $GITHUB_STATE + - name: prepare docker images tags + id: prep + run: | + REGISTRY="ghcr.io" + IMG="${REGISTRY}/${{ github.repository }}" + IMAGE=$(echo "$IMG" | tr '[:upper:]' '[:lower:]') + TAGS="${IMAGE}:${{ github.sha }}:nargo" + TAGS="${TAGS},${IMAGE}:latest:nargo,${IMAGE}:v${{ steps.date.outputs.date }}:nargo" # echo ::set-output name=tags::${TAGS} echo "tags=$TAGS" >> $GITHUB_OUTPUT echo "image=$IMAGE" >> $GITHUB_OUTPUT @@ -42,32 +81,45 @@ jobs: context: . file: Dockerfile.ci tags: ${{ steps.prep.outputs.tags }} - target: js-base + target: base-nargo cache-from: type=gha cache-to: type=gha,mode=max push: true + + test-nargo: + name: test cargo + runs-on: ubuntu-latest + needs: [build-base-nargo] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }}:nargo + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: test + run: | + /usr/src/noir/.github/scripts/test-nargo.sh - # test-nargo: - # name: test cargo - # runs-on: ubuntu-latest - # needs: [build-base] - # container: - # image: ghcr.io/noir-lang/noir:${{ github.sha }} - # credentials: - # username: ${{ github.actor }} - # password: ${{ secrets.github_token }} - # steps: - # - name: test - # run: | - # cd /usr/src/noir - # ./scripts/test_native.sh + test-source-resolver: + name: test noir wasm + runs-on: ubuntu-latest + needs: [build-base-js] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }}:js + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: test + run: | + /usr/src/noir/.github/scripts/test-source-resolver.sh test-noir-wasm: name: test noir wasm runs-on: ubuntu-latest - needs: [build-base] + needs: [build-base-js, test-source-resolver, build-base-nargo] container: - image: ghcr.io/noir-lang/noir:${{ github.sha }} + image: ghcr.io/noir-lang/noir:${{ github.sha }}:js credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} @@ -79,9 +131,9 @@ jobs: test-acvm-js: name: test acvm js runs-on: ubuntu-latest - needs: [build-base] + needs: [build-base-js] container: - image: ghcr.io/noir-lang/noir:${{ github.sha }} + image: ghcr.io/noir-lang/noir:${{ github.sha }}:js credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} @@ -93,29 +145,13 @@ jobs: test-noirc-abi: name: test noirc abi runs-on: ubuntu-latest - needs: [build-base] + needs: [build-base-js] container: - image: ghcr.io/noir-lang/noir:${{ github.sha }} + image: ghcr.io/noir-lang/noir:${{ github.sha }}:js credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} steps: - name: test run: | - /usr/src/noir/.github/scripts/test-noirc-abi.sh - - # test-noirc-abi: - # name: test noirc abi - # runs-on: ubuntu-latest - # needs: [build-base] - # container: - # image: ghcr.io/noir-lang/noir:${{ github.sha }} - # credentials: - # username: ${{ github.actor }} - # password: ${{ secrets.github_token }} - # steps: - # - name: test - # run: | - # cd /usr/src/noir - # yarn workspace @noir-lang/noirc_abi build - # yarn workspace @noir-lang/noirc_abi test \ No newline at end of file + /usr/src/noir/.github/scripts/test-noirc-abi.sh \ No newline at end of file diff --git a/Dockerfile.ci b/Dockerfile.ci index 8a34d529c22..8e87eedbb23 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1,20 +1,28 @@ FROM rust:1.71.1-slim-bookworm as base-base RUN apt-get update && apt-get upgrade -y && apt-get install build-essential git -y +WORKDIR /usr/src/noir + +FROM base-base as base-nargo +COPY . . +RUN ./scripts/bootstrap_native.sh +ENV PATH="${PATH}:/usr/src/noir/target/release" -FROM base-base as js-base +FROM base-base as base-js RUN apt-get install -y ca-certificates curl gnupg RUN mkdir -p /etc/apt/keyrings RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list RUN apt-get update && apt-get install nodejs -y RUN corepack enable -WORKDIR /usr/src/noir RUN apt-get install -y jq COPY yarn.lock package.json .yarnrc.yml ./ COPY .yarn/ ./.yarn/ # acvm-js COPY ./acvm-repo/acvm_js/package.json ./acvm-repo/acvm_js/ COPY ./tooling/noirc_abi_wasm/package.json ./tooling/noirc_abi_wasm/ +COPY ./compiler/wasm/package.json ./compiler/wasm/ +COPY ./compiler/source-resolver/package.json ./compiler/source-resolver/ + RUN yarn # RUN yarn --immutable COPY . . @@ -43,7 +51,7 @@ RUN ./scripts/install_wasm-bindgen-new.sh #Required to build COPY . . RUN ./scripts/bootstrap_native.sh -ENV PATH="${PATH}:/usr/src/noir/target/release/" +ENV PATH="${PATH}:/usr/src/noir/target/release" #Required for yarn building RUN yarn --immutable From 773f30077cb598ad4bb6f05416f371bd4bc8aadd Mon Sep 17 00:00:00 2001 From: Esau Date: Mon, 18 Dec 2023 23:04:28 +0100 Subject: [PATCH 088/182] adsf --- .github/scripts/build-nargo.sh | 5 +++++ .github/workflows/docker-test-flow.yml | 4 ++-- Dockerfile.ci | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100755 .github/scripts/build-nargo.sh diff --git a/.github/scripts/build-nargo.sh b/.github/scripts/build-nargo.sh new file mode 100755 index 00000000000..45928e6fe64 --- /dev/null +++ b/.github/scripts/build-nargo.sh @@ -0,0 +1,5 @@ +export SOURCE_DATE_EPOCH=$(date +%s) +export GIT_DIRTY=false +export GIT_COMMIT=$(git rev-parse --verify HEAD) + +cargo build --features="noirc_driver/aztec" --release diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 4f0a0caa381..0d082ba6235 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -87,7 +87,7 @@ jobs: push: true test-nargo: - name: test cargo + name: test nargo runs-on: ubuntu-latest needs: [build-base-nargo] container: @@ -101,7 +101,7 @@ jobs: /usr/src/noir/.github/scripts/test-nargo.sh test-source-resolver: - name: test noir wasm + name: test source resolver runs-on: ubuntu-latest needs: [build-base-js] container: diff --git a/Dockerfile.ci b/Dockerfile.ci index 8e87eedbb23..3d694603cba 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -4,7 +4,7 @@ WORKDIR /usr/src/noir FROM base-base as base-nargo COPY . . -RUN ./scripts/bootstrap_native.sh +RUN .github/scripts/build-nargo.sh ENV PATH="${PATH}:/usr/src/noir/target/release" FROM base-base as base-js From eaf6d80216b86e09923fb7e392224973beb2ce74 Mon Sep 17 00:00:00 2001 From: Esau Date: Mon, 18 Dec 2023 23:06:23 +0100 Subject: [PATCH 089/182] asdf --- .github/workflows/docker-test-flow.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 0d082ba6235..3c917f61b31 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -22,8 +22,8 @@ jobs: REGISTRY="ghcr.io" IMG="${REGISTRY}/${{ github.repository }}" IMAGE=$(echo "$IMG" | tr '[:upper:]' '[:lower:]') - TAGS="${IMAGE}:${{ github.sha }}:js" - TAGS="${TAGS},${IMAGE}:latest:js,${IMAGE}:v${{ steps.date.outputs.date }}:js" + TAGS="${IMAGE}:${{ github.sha }}-js" + TAGS="${TAGS},${IMAGE}:latest-js,${IMAGE}:v${{ steps.date.outputs.date }}-js" echo "tags=$TAGS" >> $GITHUB_OUTPUT echo "image=$IMAGE" >> $GITHUB_OUTPUT - name: Set up Docker Buildx @@ -61,8 +61,8 @@ jobs: REGISTRY="ghcr.io" IMG="${REGISTRY}/${{ github.repository }}" IMAGE=$(echo "$IMG" | tr '[:upper:]' '[:lower:]') - TAGS="${IMAGE}:${{ github.sha }}:nargo" - TAGS="${TAGS},${IMAGE}:latest:nargo,${IMAGE}:v${{ steps.date.outputs.date }}:nargo" + TAGS="${IMAGE}:${{ github.sha }}-nargo" + TAGS="${TAGS},${IMAGE}:latest-nargo,${IMAGE}:v${{ steps.date.outputs.date }}-nargo" # echo ::set-output name=tags::${TAGS} echo "tags=$TAGS" >> $GITHUB_OUTPUT echo "image=$IMAGE" >> $GITHUB_OUTPUT @@ -91,7 +91,7 @@ jobs: runs-on: ubuntu-latest needs: [build-base-nargo] container: - image: ghcr.io/noir-lang/noir:${{ github.sha }}:nargo + image: ghcr.io/noir-lang/noir:${{ github.sha }}-nargo credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} @@ -105,7 +105,7 @@ jobs: runs-on: ubuntu-latest needs: [build-base-js] container: - image: ghcr.io/noir-lang/noir:${{ github.sha }}:js + image: ghcr.io/noir-lang/noir:${{ github.sha }}-js credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} @@ -119,7 +119,7 @@ jobs: runs-on: ubuntu-latest needs: [build-base-js, test-source-resolver, build-base-nargo] container: - image: ghcr.io/noir-lang/noir:${{ github.sha }}:js + image: ghcr.io/noir-lang/noir:${{ github.sha }}-js credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} @@ -133,7 +133,7 @@ jobs: runs-on: ubuntu-latest needs: [build-base-js] container: - image: ghcr.io/noir-lang/noir:${{ github.sha }}:js + image: ghcr.io/noir-lang/noir:${{ github.sha }}-js credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} @@ -147,7 +147,7 @@ jobs: runs-on: ubuntu-latest needs: [build-base-js] container: - image: ghcr.io/noir-lang/noir:${{ github.sha }}:js + image: ghcr.io/noir-lang/noir:${{ github.sha }}-js credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} From ecd0e609603d4c8fe57a573b542176e0222326a3 Mon Sep 17 00:00:00 2001 From: Esau Date: Mon, 18 Dec 2023 23:40:18 +0100 Subject: [PATCH 090/182] asdf --- .github/scripts/build-nargo.sh | 4 ++ .github/scripts/test-backend-barretenberg.sh | 5 +++ .github/scripts/test-noir-codegen.sh | 5 +++ .github/scripts/test-noir-js.sh | 5 +++ .github/workflows/docker-test-flow.yml | 44 +++++++++++++++++++- Dockerfile.ci | 30 ++++++++++--- 6 files changed, 86 insertions(+), 7 deletions(-) create mode 100755 .github/scripts/test-backend-barretenberg.sh create mode 100755 .github/scripts/test-noir-codegen.sh create mode 100755 .github/scripts/test-noir-js.sh diff --git a/.github/scripts/build-nargo.sh b/.github/scripts/build-nargo.sh index 45928e6fe64..6d09d91ab33 100755 --- a/.github/scripts/build-nargo.sh +++ b/.github/scripts/build-nargo.sh @@ -1,3 +1,7 @@ +#!/bin/bash +set -eu + +cd /usr/src/noir export SOURCE_DATE_EPOCH=$(date +%s) export GIT_DIRTY=false export GIT_COMMIT=$(git rev-parse --verify HEAD) diff --git a/.github/scripts/test-backend-barretenberg.sh b/.github/scripts/test-backend-barretenberg.sh new file mode 100755 index 00000000000..673d86148f1 --- /dev/null +++ b/.github/scripts/test-backend-barretenberg.sh @@ -0,0 +1,5 @@ +#!/bin/bash +set -eu + +cd /usr/src/noir +yarn workspace @noir-lang/backend_barretenberg build \ No newline at end of file diff --git a/.github/scripts/test-noir-codegen.sh b/.github/scripts/test-noir-codegen.sh new file mode 100755 index 00000000000..c6940150e89 --- /dev/null +++ b/.github/scripts/test-noir-codegen.sh @@ -0,0 +1,5 @@ +#!/bin/bash +set -eu + +cd /usr/src/noir +yarn workspace @noir-lang/noir_codegen build \ No newline at end of file diff --git a/.github/scripts/test-noir-js.sh b/.github/scripts/test-noir-js.sh new file mode 100755 index 00000000000..3394d1867ba --- /dev/null +++ b/.github/scripts/test-noir-js.sh @@ -0,0 +1,5 @@ +#!/bin/bash +set -eu + +cd /usr/src/noir +yarn workspace @noir-lang/noir_js build \ No newline at end of file diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 3c917f61b31..12979177630 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -154,4 +154,46 @@ jobs: steps: - name: test run: | - /usr/src/noir/.github/scripts/test-noirc-abi.sh \ No newline at end of file + /usr/src/noir/.github/scripts/test-noirc-abi.sh + + test-barretenberg-backend: + name: test barretenberg backend + runs-on: ubuntu-latest + needs: [build-base-js, test-noirc-abi] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: test + run: | + /usr/src/noir/.github/scripts/test-backend-barretenberg.sh + + test-noir_js: + name: test noirjs + runs-on: ubuntu-latest + needs: [build-base-js, test-noirc-abi] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: test + run: | + /usr/src/noir/.github/scripts/test-noir-js.sh + + test-noir_codegen: + name: test noir codegen + runs-on: ubuntu-latest + needs: [build-base-js, test-noirc-abi] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: test + run: | + /usr/src/noir/.github/scripts/test-noir-codegen.sh \ No newline at end of file diff --git a/Dockerfile.ci b/Dockerfile.ci index 3d694603cba..0cb3b0a416e 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -19,11 +19,29 @@ COPY yarn.lock package.json .yarnrc.yml ./ COPY .yarn/ ./.yarn/ # acvm-js COPY ./acvm-repo/acvm_js/package.json ./acvm-repo/acvm_js/ +# noirc abi COPY ./tooling/noirc_abi_wasm/package.json ./tooling/noirc_abi_wasm/ +# noir wasm COPY ./compiler/wasm/package.json ./compiler/wasm/ +# source resolver COPY ./compiler/source-resolver/package.json ./compiler/source-resolver/ -RUN yarn +#! Things rely on this +COPY ./tooling/noir_js_types/package.json ./tooling/noir_js_types/ + +#backend barretenberg +COPY ./tooling/noir_js_backend_barretenberg/package.json ./tooling/noir_js_backend_barretenberg/ + +COPY ./tooling/noir_js/package.json ./tooling/noir_js/ + +COPY ./tooling/noir_codegen/package.json ./tooling/noir_codegen/ + +### NEW ADDED +COPY ./compiler/integration-tests/package.json ./compiler/integration-tests/ +COPY ./release-tests/package.json ./release-tests/ +COPY ./docs/package.json ./docs/ + +RUN yarn --immutable # RUN yarn --immutable COPY . . @@ -82,11 +100,11 @@ RUN corepack enable RUN yarn --immutable RUN apt-get install -y jq RUN yarn build -RUN yarn workspace @noir-lang/acvm_js test -RUN npx playwright install && npx playwright install-deps -RUN yarn workspace @noir-lang/acvm_js test:browser -RUN yarn workspace @noir-lang/noirc_abi test -RUN yarn workspace @noir-lang/noirc_abi test:browser +# RUN yarn workspace @noir-lang/acvm_js test +# RUN npx playwright install && npx playwright install-deps +# RUN yarn workspace @noir-lang/acvm_js test:browser +# RUN yarn workspace @noir-lang/noirc_abi test +# RUN yarn workspace @noir-lang/noirc_abi test:browser RUN yarn workspace @noir-lang/backend_barretenberg test RUN ./scripts/nargo_compile_noir_js_assert_lt.sh RUN rm -rf /usr/src/noir/tooling/noir_js/test/noir_compiled_examples/assert_lt/target/debug_assert_lt.json From 6a33193ddb282f51b0595b2ae603128b2a0633a9 Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 19 Dec 2023 11:48:43 +0100 Subject: [PATCH 091/182] asdf --- .github/workflows/docker-test-flow.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 12979177630..b91e8007c8b 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -85,6 +85,22 @@ jobs: cache-from: type=gha cache-to: type=gha,mode=max push: true + + artifact-nargo: + name: artifact nargo + runs-on: ubuntu-latest + needs: [build-base-nargo] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }}-nargo + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: artifact + uses: actions/upload-artifact@v4 + with: + name: nargo + path: target/release/nargo test-nargo: name: test nargo From b42c897084e0d50bbb89b76c504458eabc8a63ca Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 19 Dec 2023 12:03:23 +0100 Subject: [PATCH 092/182] asdf --- .github/workflows/docker-test-flow.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index b91e8007c8b..9701cec7bca 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -100,7 +100,8 @@ jobs: uses: actions/upload-artifact@v4 with: name: nargo - path: target/release/nargo + path: /usr/local/noir/target/release/nargo + if-no-files-found: error test-nargo: name: test nargo @@ -133,7 +134,7 @@ jobs: test-noir-wasm: name: test noir wasm runs-on: ubuntu-latest - needs: [build-base-js, test-source-resolver, build-base-nargo] + needs: [build-base-js, test-source-resolver, artifact-nargo] container: image: ghcr.io/noir-lang/noir:${{ github.sha }}-js credentials: From 925497ea20c190dc7a4e6501b2b49f914ab07225 Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 19 Dec 2023 12:14:24 +0100 Subject: [PATCH 093/182] asdf --- .github/workflows/docker-test-flow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 9701cec7bca..efc942ef21b 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -100,7 +100,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: nargo - path: /usr/local/noir/target/release/nargo + path: ./target/release/nargo if-no-files-found: error test-nargo: From 7deac130a31da345525b4e945740ded46dd05680 Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 19 Dec 2023 12:20:04 +0100 Subject: [PATCH 094/182] asdf --- .github/workflows/docker-test-flow.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index efc942ef21b..90d23c7da06 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -96,12 +96,14 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.github_token }} steps: + - run: echo ${{ github.workspace }} - name: artifact uses: actions/upload-artifact@v4 with: name: nargo path: ./target/release/nargo if-no-files-found: error + compression-level: 0 test-nargo: name: test nargo From e46f312999245ca29fa69c8645a98e7265ec4023 Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 19 Dec 2023 12:26:28 +0100 Subject: [PATCH 095/182] asdfasdf --- .github/workflows/docker-test-flow.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 90d23c7da06..c06bd4fb54d 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -97,11 +97,14 @@ jobs: password: ${{ secrets.github_token }} steps: - run: echo ${{ github.workspace }} + - run: | + mkdir dist + cp ./target/release/nargo ./dist/nargo - name: artifact uses: actions/upload-artifact@v4 with: name: nargo - path: ./target/release/nargo + path: ./dist/* if-no-files-found: error compression-level: 0 From c4476daf9258af620ede569d18fca03ee79abf03 Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 19 Dec 2023 12:40:28 +0100 Subject: [PATCH 096/182] asdf --- .github/workflows/docker-test-flow.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index c06bd4fb54d..6c793413dfb 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -97,6 +97,8 @@ jobs: password: ${{ secrets.github_token }} steps: - run: echo ${{ github.workspace }} + - run: echo ls -la + - run: echo pwd - run: | mkdir dist cp ./target/release/nargo ./dist/nargo From d7eb2b7e0c85c0a63136424f6931122fa4d7e11f Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 19 Dec 2023 12:54:05 +0100 Subject: [PATCH 097/182] asdf --- .github/workflows/docker-test-flow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 6c793413dfb..37003fb5d0c 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -97,8 +97,8 @@ jobs: password: ${{ secrets.github_token }} steps: - run: echo ${{ github.workspace }} - - run: echo ls -la - - run: echo pwd + - run: ls -la + - run: pwd - run: | mkdir dist cp ./target/release/nargo ./dist/nargo From 2edda4a294ab1026ac2b91ad733afdec9ed69b02 Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 19 Dec 2023 13:18:53 +0100 Subject: [PATCH 098/182] asdf --- .github/workflows/docker-test-flow.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 37003fb5d0c..6f232c24cf0 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -97,6 +97,7 @@ jobs: password: ${{ secrets.github_token }} steps: - run: echo ${{ github.workspace }} + - run: cd /usr/src/noir - run: ls -la - run: pwd - run: | From 6ce3af0cd590854d8d9e083de4373b5b35615499 Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 19 Dec 2023 13:31:20 +0100 Subject: [PATCH 099/182] test --- .github/workflows/docker-test-flow.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 6f232c24cf0..dc471bd98ad 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -97,9 +97,10 @@ jobs: password: ${{ secrets.github_token }} steps: - run: echo ${{ github.workspace }} - - run: cd /usr/src/noir - - run: ls -la - - run: pwd + - run: | + cd /usr/src/noir + ls -la + pwd - run: | mkdir dist cp ./target/release/nargo ./dist/nargo From 3c65b7457ddd49cbd9fffd5dd996fff6d9af1318 Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 19 Dec 2023 13:42:53 +0100 Subject: [PATCH 100/182] fixed --- .github/workflows/docker-test-flow.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index dc471bd98ad..9efd37498c3 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -97,18 +97,11 @@ jobs: password: ${{ secrets.github_token }} steps: - run: echo ${{ github.workspace }} - - run: | - cd /usr/src/noir - ls -la - pwd - - run: | - mkdir dist - cp ./target/release/nargo ./dist/nargo - name: artifact uses: actions/upload-artifact@v4 with: name: nargo - path: ./dist/* + path: /usr/src/noir/target/release/nargo if-no-files-found: error compression-level: 0 From 518682bdcb40f70b23b0deeff0e49270731b77a7 Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 19 Dec 2023 13:54:54 +0100 Subject: [PATCH 101/182] asdf --- .github/workflows/docker-test-flow.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 9efd37498c3..4c54b294790 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -96,7 +96,6 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.github_token }} steps: - - run: echo ${{ github.workspace }} - name: artifact uses: actions/upload-artifact@v4 with: @@ -143,6 +142,16 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.github_token }} steps: + - name: download nargo + uses: actions/download-artifact@v4 + with: + name: nargo + path: /usr/src/noir/target/release/nargo + - run: | + cd /usr/src/noir/ + ls -la + cd /usr/src/noir/target/release/ + ls -la - name: test run: | /usr/src/noir/.github/scripts/test-noir-wasm.sh From f1a0d5b23b8362daf107ac06e452776d0be5fcd7 Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 19 Dec 2023 15:11:54 +0100 Subject: [PATCH 102/182] asdf --- .github/workflows/docker-test-flow.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 4c54b294790..77891a19f0d 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -152,6 +152,9 @@ jobs: ls -la cd /usr/src/noir/target/release/ ls -la + nargo + cd /usr/src/noir/ + nargo - name: test run: | /usr/src/noir/.github/scripts/test-noir-wasm.sh From 505ebb6e7023383af8643427bebb1d3aaaa9f7bb Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 19 Dec 2023 15:27:46 +0100 Subject: [PATCH 103/182] sadf --- .github/workflows/docker-test-flow.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 77891a19f0d..3885a739bf0 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -148,6 +148,7 @@ jobs: name: nargo path: /usr/src/noir/target/release/nargo - run: | + echo $PATH cd /usr/src/noir/ ls -la cd /usr/src/noir/target/release/ From 68101b4e47f5774c87401c1e98ad278a63ea2bb3 Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 19 Dec 2023 15:43:56 +0100 Subject: [PATCH 104/182] asdf --- .github/workflows/docker-test-flow.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 3885a739bf0..5b014f3945b 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -148,6 +148,7 @@ jobs: name: nargo path: /usr/src/noir/target/release/nargo - run: | + PATH=$PATH:/usr/src/noir/target/release echo $PATH cd /usr/src/noir/ ls -la From 580b0926429aeeae354378ef657cf69f6e4b3906 Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 19 Dec 2023 17:57:25 +0100 Subject: [PATCH 105/182] asdf --- .github/workflows/docker-test-flow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 5b014f3945b..9a15dc030ae 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -146,7 +146,7 @@ jobs: uses: actions/download-artifact@v4 with: name: nargo - path: /usr/src/noir/target/release/nargo + path: /usr/src/noir/target/release - run: | PATH=$PATH:/usr/src/noir/target/release echo $PATH From 9ec4a30efa88b207426cdaf95767ace1f23b6a2d Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 19 Dec 2023 18:35:23 +0100 Subject: [PATCH 106/182] asdf --- .github/workflows/docker-test-flow.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 9a15dc030ae..f08166fe2d4 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -149,11 +149,8 @@ jobs: path: /usr/src/noir/target/release - run: | PATH=$PATH:/usr/src/noir/target/release - echo $PATH - cd /usr/src/noir/ - ls -la cd /usr/src/noir/target/release/ - ls -la + chmod +x nargo nargo cd /usr/src/noir/ nargo From b0f5736d62a9501efec14512a317761f8960483d Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 19 Dec 2023 18:47:24 +0100 Subject: [PATCH 107/182] asdf --- .github/workflows/docker-test-flow.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index f08166fe2d4..a73bf5120d1 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -151,7 +151,6 @@ jobs: PATH=$PATH:/usr/src/noir/target/release cd /usr/src/noir/target/release/ chmod +x nargo - nargo cd /usr/src/noir/ nargo - name: test From cf89645075de098766609bbd0fe0a77f8dc8c742 Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 19 Dec 2023 18:57:17 +0100 Subject: [PATCH 108/182] asdf --- .github/workflows/docker-test-flow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index a73bf5120d1..694da461f04 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -152,9 +152,9 @@ jobs: cd /usr/src/noir/target/release/ chmod +x nargo cd /usr/src/noir/ - nargo - name: test run: | + nargo /usr/src/noir/.github/scripts/test-noir-wasm.sh test-acvm-js: From d3429202522fda214cf7beb87b3bf21ef2f6712a Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 19 Dec 2023 19:09:14 +0100 Subject: [PATCH 109/182] sfd --- Dockerfile.ci | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile.ci b/Dockerfile.ci index 0cb3b0a416e..45e74015898 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1,6 +1,7 @@ FROM rust:1.71.1-slim-bookworm as base-base RUN apt-get update && apt-get upgrade -y && apt-get install build-essential git -y WORKDIR /usr/src/noir +ENV PATH="${PATH}:/usr/src/noir/target/release" FROM base-base as base-nargo COPY . . From e45d959e4e84d4618d6a3a32d4f9b16ac2f14033 Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 19 Dec 2023 19:19:57 +0100 Subject: [PATCH 110/182] asdf --- .github/workflows/docker-test-flow.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 694da461f04..fad2dd8883a 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -154,7 +154,6 @@ jobs: cd /usr/src/noir/ - name: test run: | - nargo /usr/src/noir/.github/scripts/test-noir-wasm.sh test-acvm-js: From 70cb5e7339fe9e649d988f0fc48ba1d0024d6d28 Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 19 Dec 2023 19:31:47 +0100 Subject: [PATCH 111/182] asdf --- .github/workflows/docker-test-flow.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index fad2dd8883a..ab2a67db8d4 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -147,11 +147,9 @@ jobs: with: name: nargo path: /usr/src/noir/target/release - - run: | - PATH=$PATH:/usr/src/noir/target/release - cd /usr/src/noir/target/release/ - chmod +x nargo - cd /usr/src/noir/ + - name: prep downloaded artifact + run: | + chmod +x /usr/src/noir/target/release/nargo - name: test run: | /usr/src/noir/.github/scripts/test-noir-wasm.sh From 04a25e76afe751c565d3ae0b27a1d972f79a285d Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 19 Dec 2023 19:56:38 +0100 Subject: [PATCH 112/182] asdf --- .github/workflows/docker-test-flow.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index ab2a67db8d4..0cb61bde88a 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -131,6 +131,15 @@ jobs: - name: test run: | /usr/src/noir/.github/scripts/test-source-resolver.sh + - name: artifact + uses: actions/upload-artifact@v4 + with: + name: source-resolver + path: | + /usr/src/noir/compiler/source-resolver/lib + /usr/src/noir/compiler/source-resolver/lib-node + /usr/src/noir/compiler/source-resolver/types + if-no-files-found: error test-noir-wasm: name: test noir wasm @@ -150,6 +159,11 @@ jobs: - name: prep downloaded artifact run: | chmod +x /usr/src/noir/target/release/nargo + - name: download source-resolver + uses: actions/download-artifact@v4 + with: + name: source-resolver + path: /usr/src/noir/compiler/source-resolver - name: test run: | /usr/src/noir/.github/scripts/test-noir-wasm.sh From 0aef707c9d1c23f75b1726057cccdc0ff7af725e Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 19 Dec 2023 21:28:03 +0100 Subject: [PATCH 113/182] asdf --- .github/scripts/build-noir-js-types.sh | 5 +++ .github/workflows/docker-test-flow.yml | 49 +++++++++++++++++++++++++- Dockerfile.ci | 4 --- 3 files changed, 53 insertions(+), 5 deletions(-) create mode 100755 .github/scripts/build-noir-js-types.sh diff --git a/.github/scripts/build-noir-js-types.sh b/.github/scripts/build-noir-js-types.sh new file mode 100755 index 00000000000..5b0c0416e2b --- /dev/null +++ b/.github/scripts/build-noir-js-types.sh @@ -0,0 +1,5 @@ +#!/bin/bash +set -eu + +cd /usr/src/noir +yarn workspace @noir-lang/types build \ No newline at end of file diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 0cb61bde88a..c702a6cc786 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -141,6 +141,35 @@ jobs: /usr/src/noir/compiler/source-resolver/types if-no-files-found: error + build-noir-js-types: + name: build noir types + runs-on: ubuntu-latest + needs: [build-base-js, test-noirc-abi] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: download artifact + uses: actions/download-artifact@v4 + with: + name: noirc-abi-wasm + path: | + /usr/src/noir/tooling/noirc_abi_wasm + - name: build + run: | + /usr/src/noir/.github/scripts/build-noir-js-types.sh + - name: artifact + uses: actions/upload-artifact@v4 + with: + name: noir-js-types + path: | + /usr/src/noir/tooling/noir_js_types/lib/cjs + /usr/src/noir/tooling/noir_js_types/lib/esm + if-no-files-found: error + compression-level: 0 + test-noir-wasm: name: test noir wasm runs-on: ubuntu-latest @@ -195,17 +224,35 @@ jobs: - name: test run: | /usr/src/noir/.github/scripts/test-noirc-abi.sh + - name: artifact + uses: actions/upload-artifact@v4 + with: + name: noirc-abi-wasm + path: | + /usr/src/noir/tooling/noirc_abi_wasm/nodejs + /usr/src/noir/tooling/noirc_abi_wasm/web + /usr/src/noir/tooling/noirc_abi_wasm/target + /usr/src/noir/tooling/noirc_abi_wasm/outputs + /usr/src/noir/tooling/noirc_abi_wasm/result + if-no-files-found: error + compression-level: 0 test-barretenberg-backend: name: test barretenberg backend runs-on: ubuntu-latest - needs: [build-base-js, test-noirc-abi] + # needs: [build-base-js, test-noirc-abi] + needs: [build-base-js] container: image: ghcr.io/noir-lang/noir:${{ github.sha }}-js credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} steps: + - name: download source-resolver + uses: actions/download-artifact@v4 + with: + name: noir-js-types + path: /usr/src/noir/tooling/noir_js_types/lib/ - name: test run: | /usr/src/noir/.github/scripts/test-backend-barretenberg.sh diff --git a/Dockerfile.ci b/Dockerfile.ci index 45e74015898..87b1c97b29c 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -26,15 +26,11 @@ COPY ./tooling/noirc_abi_wasm/package.json ./tooling/noirc_abi_wasm/ COPY ./compiler/wasm/package.json ./compiler/wasm/ # source resolver COPY ./compiler/source-resolver/package.json ./compiler/source-resolver/ - #! Things rely on this COPY ./tooling/noir_js_types/package.json ./tooling/noir_js_types/ - #backend barretenberg COPY ./tooling/noir_js_backend_barretenberg/package.json ./tooling/noir_js_backend_barretenberg/ - COPY ./tooling/noir_js/package.json ./tooling/noir_js/ - COPY ./tooling/noir_codegen/package.json ./tooling/noir_codegen/ ### NEW ADDED From 871c40f6ab96edbe20aa92cdba8996deb3441ace Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 19 Dec 2023 21:44:53 +0100 Subject: [PATCH 114/182] asdf --- .github/scripts/test-backend-barretenberg.sh | 3 ++- .github/workflows/docker-test-flow.yml | 15 ++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/scripts/test-backend-barretenberg.sh b/.github/scripts/test-backend-barretenberg.sh index 673d86148f1..8a53a2c1117 100755 --- a/.github/scripts/test-backend-barretenberg.sh +++ b/.github/scripts/test-backend-barretenberg.sh @@ -2,4 +2,5 @@ set -eu cd /usr/src/noir -yarn workspace @noir-lang/backend_barretenberg build \ No newline at end of file +yarn workspace @noir-lang/backend_barretenberg build +yarn workspace @noir-lang/backend_barretenberg test \ No newline at end of file diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index c702a6cc786..dabb56f469f 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -240,19 +240,24 @@ jobs: test-barretenberg-backend: name: test barretenberg backend runs-on: ubuntu-latest - # needs: [build-base-js, test-noirc-abi] - needs: [build-base-js] + needs: [build-base-js, test-noirc-abi] container: image: ghcr.io/noir-lang/noir:${{ github.sha }}-js credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} steps: - - name: download source-resolver + - name: download artifact uses: actions/download-artifact@v4 with: - name: noir-js-types - path: /usr/src/noir/tooling/noir_js_types/lib/ + name: noirc-abi-wasm + path: | + /usr/src/noir/tooling/noirc_abi_wasm + # - name: download source-resolver + # uses: actions/download-artifact@v4 + # with: + # name: noir-js-types + # path: /usr/src/noir/tooling/noir_js_types/lib/ - name: test run: | /usr/src/noir/.github/scripts/test-backend-barretenberg.sh From 4f487586f6537df7e0bdf00cfb6fa38732edbafc Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 19 Dec 2023 22:07:53 +0100 Subject: [PATCH 115/182] asdf --- .github/workflows/docker-test-flow.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index dabb56f469f..4ae4262cd7c 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -240,7 +240,7 @@ jobs: test-barretenberg-backend: name: test barretenberg backend runs-on: ubuntu-latest - needs: [build-base-js, test-noirc-abi] + needs: [build-base-js, test-noirc-abi, build-noir-js-types] container: image: ghcr.io/noir-lang/noir:${{ github.sha }}-js credentials: @@ -253,11 +253,11 @@ jobs: name: noirc-abi-wasm path: | /usr/src/noir/tooling/noirc_abi_wasm - # - name: download source-resolver - # uses: actions/download-artifact@v4 - # with: - # name: noir-js-types - # path: /usr/src/noir/tooling/noir_js_types/lib/ + - name: download noir js types + uses: actions/download-artifact@v4 + with: + name: noir-js-types + path: /usr/src/noir/tooling/noir_js_types/lib/ - name: test run: | /usr/src/noir/.github/scripts/test-backend-barretenberg.sh From ed3b170b8ab8f9f8e51b08684c4ef0ece016d78e Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 19 Dec 2023 22:55:55 +0100 Subject: [PATCH 116/182] asdf --- .github/scripts/test-noir-codegen.sh | 5 ++++- .github/scripts/test-noir-js.sh | 5 ++++- .github/workflows/docker-test-flow.yml | 19 ++++++++++++++++++- Dockerfile.ci | 8 ++++---- 4 files changed, 30 insertions(+), 7 deletions(-) diff --git a/.github/scripts/test-noir-codegen.sh b/.github/scripts/test-noir-codegen.sh index c6940150e89..fad0a22604b 100755 --- a/.github/scripts/test-noir-codegen.sh +++ b/.github/scripts/test-noir-codegen.sh @@ -2,4 +2,7 @@ set -eu cd /usr/src/noir -yarn workspace @noir-lang/noir_codegen build \ No newline at end of file +yarn workspace @noir-lang/noir_codegen build +./scripts/nargo_compile_noir_codegen_assert_lt.sh +rm -rf /usr/src/noir/tooling/noir_codegen/test/assert_lt/target/debug_assert_lt.json +yarn workspace @noir-lang/noir_codegen test \ No newline at end of file diff --git a/.github/scripts/test-noir-js.sh b/.github/scripts/test-noir-js.sh index 3394d1867ba..7561699af4c 100755 --- a/.github/scripts/test-noir-js.sh +++ b/.github/scripts/test-noir-js.sh @@ -2,4 +2,7 @@ set -eu cd /usr/src/noir -yarn workspace @noir-lang/noir_js build \ No newline at end of file +yarn workspace @noir-lang/noir_js build +./scripts/nargo_compile_noir_js_assert_lt.sh +rm -rf /usr/src/noir/tooling/noir_js/test/noir_compiled_examples/assert_lt/target/debug_assert_lt.json +yarn workspace @noir-lang/noir_js test \ No newline at end of file diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 4ae4262cd7c..d9eef6b4c80 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -170,6 +170,7 @@ jobs: if-no-files-found: error compression-level: 0 + # DONE test-noir-wasm: name: test noir wasm runs-on: ubuntu-latest @@ -237,6 +238,7 @@ jobs: if-no-files-found: error compression-level: 0 + # DONE test-barretenberg-backend: name: test barretenberg backend runs-on: ubuntu-latest @@ -276,16 +278,31 @@ jobs: run: | /usr/src/noir/.github/scripts/test-noir-js.sh + # DONE test-noir_codegen: name: test noir codegen runs-on: ubuntu-latest - needs: [build-base-js, test-noirc-abi] + needs: [build-base-js, artifact-nargo, test-noirc-abi] container: image: ghcr.io/noir-lang/noir:${{ github.sha }}-js credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} steps: + - name: download nargo + uses: actions/download-artifact@v4 + with: + name: nargo + path: /usr/src/noir/target/release + - name: prep downloaded artifact + run: | + chmod +x /usr/src/noir/target/release/nargo + - name: download artifact + uses: actions/download-artifact@v4 + with: + name: noirc-abi-wasm + path: | + /usr/src/noir/tooling/noirc_abi_wasm - name: test run: | /usr/src/noir/.github/scripts/test-noir-codegen.sh \ No newline at end of file diff --git a/Dockerfile.ci b/Dockerfile.ci index 87b1c97b29c..45b59126429 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -102,14 +102,14 @@ RUN yarn build # RUN yarn workspace @noir-lang/acvm_js test:browser # RUN yarn workspace @noir-lang/noirc_abi test # RUN yarn workspace @noir-lang/noirc_abi test:browser -RUN yarn workspace @noir-lang/backend_barretenberg test +# RUN yarn workspace @noir-lang/backend_barretenberg test RUN ./scripts/nargo_compile_noir_js_assert_lt.sh RUN rm -rf /usr/src/noir/tooling/noir_js/test/noir_compiled_examples/assert_lt/target/debug_assert_lt.json RUN yarn workspace @noir-lang/noir_js test RUN yarn workspace @noir-lang/source-resolver test -RUN ./scripts/nargo_compile_wasm_fixtures.sh -RUN yarn workspace @noir-lang/noir_wasm test:node -RUN yarn workspace @noir-lang/noir_wasm test:browser +# RUN ./scripts/nargo_compile_wasm_fixtures.sh +# RUN yarn workspace @noir-lang/noir_wasm test:node +# RUN yarn workspace @noir-lang/noir_wasm test:browser RUN ./scripts/nargo_compile_noir_codegen_assert_lt.sh RUN rm -rf /usr/src/noir/tooling/noir_codegen/test/assert_lt/target/debug_assert_lt.json RUN yarn workspace @noir-lang/noir_codegen test From 93c70c134dca3f7d37ed346fb7a2b83af8a00e9a Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 19 Dec 2023 23:14:38 +0100 Subject: [PATCH 117/182] almost --- .github/workflows/docker-test-flow.yml | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index d9eef6b4c80..205e4c0fe59 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -103,7 +103,8 @@ jobs: path: /usr/src/noir/target/release/nargo if-no-files-found: error compression-level: 0 - + + #done test-nargo: name: test nargo runs-on: ubuntu-latest @@ -118,6 +119,7 @@ jobs: run: | /usr/src/noir/.github/scripts/test-nargo.sh + #done test-source-resolver: name: test source resolver runs-on: ubuntu-latest @@ -141,6 +143,7 @@ jobs: /usr/src/noir/compiler/source-resolver/types if-no-files-found: error + #done build-noir-js-types: name: build noir types runs-on: ubuntu-latest @@ -198,6 +201,7 @@ jobs: run: | /usr/src/noir/.github/scripts/test-noir-wasm.sh + #DONE test-acvm-js: name: test acvm js runs-on: ubuntu-latest @@ -212,6 +216,7 @@ jobs: run: | /usr/src/noir/.github/scripts/test-acvm-js.sh + #DONE test-noirc-abi: name: test noirc abi runs-on: ubuntu-latest @@ -267,13 +272,27 @@ jobs: test-noir_js: name: test noirjs runs-on: ubuntu-latest - needs: [build-base-js, test-noirc-abi] + needs: [build-base-js, test-noirc-abi, artifact-nargo] container: image: ghcr.io/noir-lang/noir:${{ github.sha }}-js credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} steps: + - name: download nargo + uses: actions/download-artifact@v4 + with: + name: nargo + path: /usr/src/noir/target/release + - name: prep downloaded artifact + run: | + chmod +x /usr/src/noir/target/release/nargo + - name: download artifact + uses: actions/download-artifact@v4 + with: + name: noirc-abi-wasm + path: | + /usr/src/noir/tooling/noirc_abi_wasm - name: test run: | /usr/src/noir/.github/scripts/test-noir-js.sh From 6c3f4ff6587383a687406b9e270443ac22462d2f Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 19 Dec 2023 23:39:09 +0100 Subject: [PATCH 118/182] noirjs --- .github/workflows/docker-test-flow.yml | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 205e4c0fe59..bc8c2293534 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -216,6 +216,19 @@ jobs: run: | /usr/src/noir/.github/scripts/test-acvm-js.sh + - name: artifact + uses: actions/upload-artifact@v4 + with: + name: acvm-js + path: | + /usr/src/noir/acvm-repo/acvm-js/nodejs + /usr/src/noir/acvm-repo/acvm-js/web + /usr/src/noir/acvm-repo/acvm-js/target + /usr/src/noir/acvm-repo/acvm-js/outputs + /usr/src/noir/acvm-repo/acvm-js/result + if-no-files-found: error + compression-level: 0 + #DONE test-noirc-abi: name: test noirc abi @@ -272,7 +285,7 @@ jobs: test-noir_js: name: test noirjs runs-on: ubuntu-latest - needs: [build-base-js, test-noirc-abi, artifact-nargo] + needs: [build-base-js, test-noirc-abi, artifact-nargo, test-acvm-js] container: image: ghcr.io/noir-lang/noir:${{ github.sha }}-js credentials: @@ -293,6 +306,12 @@ jobs: name: noirc-abi-wasm path: | /usr/src/noir/tooling/noirc_abi_wasm + - name: download artifact + uses: actions/download-artifact@v4 + with: + name: acvm-js + path: | + /usr/src/noir/acvm-repo/acvm-js/ - name: test run: | /usr/src/noir/.github/scripts/test-noir-js.sh From 2aa029be47ab00c7e0734d4bc0a39f819b4d7dae Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 20 Dec 2023 00:17:25 +0100 Subject: [PATCH 119/182] asdf --- .github/workflows/docker-test-flow.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index bc8c2293534..f3c778f766d 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -221,11 +221,11 @@ jobs: with: name: acvm-js path: | - /usr/src/noir/acvm-repo/acvm-js/nodejs - /usr/src/noir/acvm-repo/acvm-js/web - /usr/src/noir/acvm-repo/acvm-js/target - /usr/src/noir/acvm-repo/acvm-js/outputs - /usr/src/noir/acvm-repo/acvm-js/result + /usr/src/noir/acvm-repo/acvm_js/nodejs + /usr/src/noir/acvm-repo/acvm_js/web + /usr/src/noir/acvm-repo/acvm_js/target + /usr/src/noir/acvm-repo/acvm_js/outputs + /usr/src/noir/acvm-repo/acvm_js/result if-no-files-found: error compression-level: 0 From adb1bbca1c8cac597daf798c3a74a0a707373d74 Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 20 Dec 2023 00:18:54 +0100 Subject: [PATCH 120/182] asdf --- .github/workflows/docker-test-flow.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index f3c778f766d..cb9ffd331a8 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -320,7 +320,7 @@ jobs: test-noir_codegen: name: test noir codegen runs-on: ubuntu-latest - needs: [build-base-js, artifact-nargo, test-noirc-abi] + needs: [build-base-js, artifact-nargo, test-noirc-abi, build-noir-js-types] container: image: ghcr.io/noir-lang/noir:${{ github.sha }}-js credentials: @@ -341,6 +341,12 @@ jobs: name: noirc-abi-wasm path: | /usr/src/noir/tooling/noirc_abi_wasm + - name: artifact + uses: actions/download-artifact@v4 + with: + name: noir-js-types + path: | + /usr/src/noir/tooling/noir_js_types/lib - name: test run: | /usr/src/noir/.github/scripts/test-noir-codegen.sh \ No newline at end of file From 2b9b710cae70c2661337856a96835f77ca91b909 Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 20 Dec 2023 00:19:59 +0100 Subject: [PATCH 121/182] asdf --- .github/workflows/docker-test-flow.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index cb9ffd331a8..84be2298235 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -6,6 +6,10 @@ on: # - 'master' - 'cache-docker-artifacts' +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.ref || github.run_id }} + cancel-in-progress: true + jobs: build-base-js: name: Build base js image From 4d1caf31c9c05854da380ffe45c85f97a2fb77c1 Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 20 Dec 2023 01:39:38 +0100 Subject: [PATCH 122/182] asdf --- .github/workflows/docker-test-flow.yml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 84be2298235..14aa65c39f5 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -251,12 +251,8 @@ jobs: uses: actions/upload-artifact@v4 with: name: noirc-abi-wasm - path: | - /usr/src/noir/tooling/noirc_abi_wasm/nodejs - /usr/src/noir/tooling/noirc_abi_wasm/web - /usr/src/noir/tooling/noirc_abi_wasm/target - /usr/src/noir/tooling/noirc_abi_wasm/outputs - /usr/src/noir/tooling/noirc_abi_wasm/result + path: + /usr/src/noir/tooling/noirc_abi_wasm/outputs/out/noirc_abi_wasm if-no-files-found: error compression-level: 0 @@ -339,12 +335,11 @@ jobs: - name: prep downloaded artifact run: | chmod +x /usr/src/noir/target/release/nargo - - name: download artifact - uses: actions/download-artifact@v4 + - name: Download noirc_abi package artifact + uses: actions/download-artifact@v3 with: - name: noirc-abi-wasm - path: | - /usr/src/noir/tooling/noirc_abi_wasm + name: noirc_abi_wasm + path: ./tooling/noirc_abi_wasm - name: artifact uses: actions/download-artifact@v4 with: From 930f4e233755ec50d372c419ca168a074dfa10ce Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 20 Dec 2023 12:08:14 +0100 Subject: [PATCH 123/182] test --- .github/workflows/docker-test-flow.yml | 18 +++++++++--------- Dockerfile.ci | 6 +++++- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 14aa65c39f5..8bd44e453a0 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -219,17 +219,12 @@ jobs: - name: test run: | /usr/src/noir/.github/scripts/test-acvm-js.sh - - name: artifact uses: actions/upload-artifact@v4 with: name: acvm-js - path: | - /usr/src/noir/acvm-repo/acvm_js/nodejs - /usr/src/noir/acvm-repo/acvm_js/web - /usr/src/noir/acvm-repo/acvm_js/target - /usr/src/noir/acvm-repo/acvm_js/outputs - /usr/src/noir/acvm-repo/acvm_js/result + path: + /usr/src/noir/acvm-repo/acvm_js/outputs/out/acvm_js if-no-files-found: error compression-level: 0 @@ -311,7 +306,7 @@ jobs: with: name: acvm-js path: | - /usr/src/noir/acvm-repo/acvm-js/ + /usr/src/noir/acvm-repo/acvm-js - name: test run: | /usr/src/noir/.github/scripts/test-noir-js.sh @@ -320,7 +315,7 @@ jobs: test-noir_codegen: name: test noir codegen runs-on: ubuntu-latest - needs: [build-base-js, artifact-nargo, test-noirc-abi, build-noir-js-types] + needs: [build-base-js, artifact-nargo, test-noirc-abi, test-acvm-js, build-noir-js-types, test-noir_js] container: image: ghcr.io/noir-lang/noir:${{ github.sha }}-js credentials: @@ -340,6 +335,11 @@ jobs: with: name: noirc_abi_wasm path: ./tooling/noirc_abi_wasm + - name: Download acvm_js package artifact + uses: actions/download-artifact@v3 + with: + name: acvm-js + path: ./acvm-repo/acvm_js - name: artifact uses: actions/download-artifact@v4 with: diff --git a/Dockerfile.ci b/Dockerfile.ci index 45b59126429..7888249c730 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -6,7 +6,6 @@ ENV PATH="${PATH}:/usr/src/noir/target/release" FROM base-base as base-nargo COPY . . RUN .github/scripts/build-nargo.sh -ENV PATH="${PATH}:/usr/src/noir/target/release" FROM base-base as base-js RUN apt-get install -y ca-certificates curl gnupg @@ -42,6 +41,11 @@ RUN yarn --immutable # RUN yarn --immutable COPY . . +# #TEMP +# RUN .github/scripts/build-nargo.sh +# RUN ./scripts/install_wasm-bindgen-new.sh + + FROM base-base as base WORKDIR /usr/src/noir COPY . . From f090f9b6b938fe95c45135af20c7906921b7cf94 Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 20 Dec 2023 12:29:24 +0100 Subject: [PATCH 124/182] asdf --- .github/workflows/docker-test-flow.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 8bd44e453a0..b72c3fc18cd 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -307,6 +307,8 @@ jobs: name: acvm-js path: | /usr/src/noir/acvm-repo/acvm-js + - name: Build noir_js_types + run: yarn workspace @noir-lang/types build - name: test run: | /usr/src/noir/.github/scripts/test-noir-js.sh From ed1914fc057665a4cde959e79b52349c4418c07d Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 20 Dec 2023 12:41:43 +0100 Subject: [PATCH 125/182] asdf --- .../scripts/{test-acvm-js.sh => test-acvm_js.sh} | 0 .github/workflows/docker-test-flow.yml | 16 ++++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) rename .github/scripts/{test-acvm-js.sh => test-acvm_js.sh} (100%) diff --git a/.github/scripts/test-acvm-js.sh b/.github/scripts/test-acvm_js.sh similarity index 100% rename from .github/scripts/test-acvm-js.sh rename to .github/scripts/test-acvm_js.sh diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index b72c3fc18cd..b5bb55f330c 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -206,7 +206,7 @@ jobs: /usr/src/noir/.github/scripts/test-noir-wasm.sh #DONE - test-acvm-js: + test-acvm_js: name: test acvm js runs-on: ubuntu-latest needs: [build-base-js] @@ -218,11 +218,11 @@ jobs: steps: - name: test run: | - /usr/src/noir/.github/scripts/test-acvm-js.sh + /usr/src/noir/.github/scripts/test-acvm_js.sh - name: artifact uses: actions/upload-artifact@v4 with: - name: acvm-js + name: acvm_js path: /usr/src/noir/acvm-repo/acvm_js/outputs/out/acvm_js if-no-files-found: error @@ -280,7 +280,7 @@ jobs: test-noir_js: name: test noirjs runs-on: ubuntu-latest - needs: [build-base-js, test-noirc-abi, artifact-nargo, test-acvm-js] + needs: [build-base-js, test-noirc-abi, artifact-nargo, test-acvm_js] container: image: ghcr.io/noir-lang/noir:${{ github.sha }}-js credentials: @@ -304,9 +304,9 @@ jobs: - name: download artifact uses: actions/download-artifact@v4 with: - name: acvm-js + name: acvm_js path: | - /usr/src/noir/acvm-repo/acvm-js + /usr/src/noir/acvm-repo/acvm_js - name: Build noir_js_types run: yarn workspace @noir-lang/types build - name: test @@ -317,7 +317,7 @@ jobs: test-noir_codegen: name: test noir codegen runs-on: ubuntu-latest - needs: [build-base-js, artifact-nargo, test-noirc-abi, test-acvm-js, build-noir-js-types, test-noir_js] + needs: [build-base-js, artifact-nargo, test-noirc-abi, test-acvm_js, build-noir-js-types, test-noir_js] container: image: ghcr.io/noir-lang/noir:${{ github.sha }}-js credentials: @@ -340,7 +340,7 @@ jobs: - name: Download acvm_js package artifact uses: actions/download-artifact@v3 with: - name: acvm-js + name: acvm_js path: ./acvm-repo/acvm_js - name: artifact uses: actions/download-artifact@v4 From d379e46db3fe4b21dea097b9cc84c79e9304e8c2 Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 20 Dec 2023 12:52:00 +0100 Subject: [PATCH 126/182] asdf --- .github/workflows/docker-test-flow.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index b5bb55f330c..602d2213f60 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -307,8 +307,6 @@ jobs: name: acvm_js path: | /usr/src/noir/acvm-repo/acvm_js - - name: Build noir_js_types - run: yarn workspace @noir-lang/types build - name: test run: | /usr/src/noir/.github/scripts/test-noir-js.sh From f54e743a53787f614660043a2ac843a87281eea0 Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 20 Dec 2023 13:07:48 +0100 Subject: [PATCH 127/182] asdf --- .github/workflows/docker-test-flow.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 602d2213f60..a296715bcb8 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -276,11 +276,19 @@ jobs: - name: test run: | /usr/src/noir/.github/scripts/test-backend-barretenberg.sh + - name: artifact + uses: actions/upload-artifact@v4 + with: + name: barretenberg-backend + path: + /usr/src/noir/tooling/noir_js_backend_barretenberg/lib + if-no-files-found: error + compression-level: 0 test-noir_js: name: test noirjs runs-on: ubuntu-latest - needs: [build-base-js, test-noirc-abi, artifact-nargo, test-acvm_js] + needs: [build-base-js, test-noirc-abi, artifact-nargo, test-acvm_js, test-barretenberg-backend] container: image: ghcr.io/noir-lang/noir:${{ github.sha }}-js credentials: @@ -307,6 +315,12 @@ jobs: name: acvm_js path: | /usr/src/noir/acvm-repo/acvm_js + - name: artifact + uses: actions/download-artifact@v4 + with: + name: barretenberg-backend + path: + /usr/src/noir/tooling/noir_js_backend_barretenberg/lib - name: test run: | /usr/src/noir/.github/scripts/test-noir-js.sh From a5837bc3c423f5b94b99e536bf0bf170864943c5 Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 20 Dec 2023 13:25:16 +0100 Subject: [PATCH 128/182] asdf --- .github/workflows/docker-test-flow.yml | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index a296715bcb8..02585affa5a 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -172,8 +172,7 @@ jobs: with: name: noir-js-types path: | - /usr/src/noir/tooling/noir_js_types/lib/cjs - /usr/src/noir/tooling/noir_js_types/lib/esm + /usr/src/noir/tooling/noir_js_types/lib if-no-files-found: error compression-level: 0 @@ -321,9 +320,21 @@ jobs: name: barretenberg-backend path: /usr/src/noir/tooling/noir_js_backend_barretenberg/lib + - name: artifact + uses: actions/download-artifact@v4 + with: + name: noir-js-types + path: | + /usr/src/noir/tooling/noir_js_types/lib - name: test run: | /usr/src/noir/.github/scripts/test-noir-js.sh + - name: artifact + uses: actions/upload-artifact@v4 + with: + name: noir_js + path: + /usr/src/noir/tooling/noir_js/lib # DONE test-noir_codegen: @@ -360,6 +371,12 @@ jobs: name: noir-js-types path: | /usr/src/noir/tooling/noir_js_types/lib + - name: artifact + uses: actions/download-artifact@v4 + with: + name: noir_js + path: + /usr/src/noir/tooling/noir_js/lib - name: test run: | /usr/src/noir/.github/scripts/test-noir-codegen.sh \ No newline at end of file From 26083ab9b64ab451d59d05eb6547deb7009ebd81 Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 20 Dec 2023 13:40:00 +0100 Subject: [PATCH 129/182] asdf --- .github/workflows/docker-test-flow.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 02585affa5a..c42a11d7ffc 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -161,7 +161,7 @@ jobs: - name: download artifact uses: actions/download-artifact@v4 with: - name: noirc-abi-wasm + name: noirc_abi_wasm path: | /usr/src/noir/tooling/noirc_abi_wasm - name: build @@ -244,7 +244,7 @@ jobs: - name: artifact uses: actions/upload-artifact@v4 with: - name: noirc-abi-wasm + name: noirc_abi_wasm path: /usr/src/noir/tooling/noirc_abi_wasm/outputs/out/noirc_abi_wasm if-no-files-found: error @@ -264,7 +264,7 @@ jobs: - name: download artifact uses: actions/download-artifact@v4 with: - name: noirc-abi-wasm + name: noirc_abi_wasm path: | /usr/src/noir/tooling/noirc_abi_wasm - name: download noir js types @@ -305,7 +305,7 @@ jobs: - name: download artifact uses: actions/download-artifact@v4 with: - name: noirc-abi-wasm + name: noirc_abi_wasm path: | /usr/src/noir/tooling/noirc_abi_wasm - name: download artifact From 35ec08ebd60413e133d7c165f1edf38ae22df5b7 Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 20 Dec 2023 13:47:02 +0100 Subject: [PATCH 130/182] asdf --- .github/workflows/docker-test-flow.yml | 63 +++++++++++++++++++++++--- 1 file changed, 57 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index c42a11d7ffc..0884e0da83c 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -108,7 +108,6 @@ jobs: if-no-files-found: error compression-level: 0 - #done test-nargo: name: test nargo runs-on: ubuntu-latest @@ -123,7 +122,6 @@ jobs: run: | /usr/src/noir/.github/scripts/test-nargo.sh - #done test-source-resolver: name: test source resolver runs-on: ubuntu-latest @@ -147,7 +145,6 @@ jobs: /usr/src/noir/compiler/source-resolver/types if-no-files-found: error - #done build-noir-js-types: name: build noir types runs-on: ubuntu-latest @@ -176,7 +173,6 @@ jobs: if-no-files-found: error compression-level: 0 - # DONE test-noir-wasm: name: test noir wasm runs-on: ubuntu-latest @@ -203,6 +199,12 @@ jobs: - name: test run: | /usr/src/noir/.github/scripts/test-noir-wasm.sh + - name: Upload artifact + uses: actions/upload-artifact@v4 + with: + name: noir_wasm + path: /usr/src/noir/compiler/wasm/outputs/out/noir_wasm + retention-days: 3 #DONE test-acvm_js: @@ -356,12 +358,12 @@ jobs: run: | chmod +x /usr/src/noir/target/release/nargo - name: Download noirc_abi package artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: noirc_abi_wasm path: ./tooling/noirc_abi_wasm - name: Download acvm_js package artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: acvm_js path: ./acvm-repo/acvm_js @@ -377,6 +379,55 @@ jobs: name: noir_js path: /usr/src/noir/tooling/noir_js/lib + - name: test + run: | + /usr/src/noir/.github/scripts/test-noir-codegen.sh + + test-integration: + name: integration test + runs-on: ubuntu-latest + needs: [build-base-js, artifact-nargo, test-noir-wasm, test-noirc-abi, test-acvm_js, build-noir-js-types, test-noir_js] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: download nargo + uses: actions/download-artifact@v4 + with: + name: nargo + path: /usr/src/noir/target/release + - name: prep downloaded artifact + run: | + chmod +x /usr/src/noir/target/release/nargo + - name: Upload artifact + uses: actions/download-artifact@v4 + with: + name: noir_wasm + path: /usr/src/noir/compiler/wasm/outputs/out/noir_wasm + - name: Download noirc_abi package artifact + uses: actions/download-artifact@v4 + with: + name: noirc_abi_wasm + path: ./tooling/noirc_abi_wasm + - name: Download acvm_js package artifact + uses: actions/download-artifact@v4 + with: + name: acvm_js + path: ./acvm-repo/acvm_js + - name: Download noir js types + uses: actions/download-artifact@v4 + with: + name: noir-js-types + path: | + /usr/src/noir/tooling/noir_js_types/lib + - name: Download noir js + uses: actions/download-artifact@v4 + with: + name: noir_js + path: + /usr/src/noir/tooling/noir_js/lib - name: test run: | /usr/src/noir/.github/scripts/test-noir-codegen.sh \ No newline at end of file From 7064de858d6a9980bc7fbd9dfb67d213160cfed8 Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 20 Dec 2023 14:02:53 +0100 Subject: [PATCH 131/182] asdf --- .github/workflows/docker-test-flow.yml | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 0884e0da83c..ea6c681bb5f 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -430,4 +430,27 @@ jobs: /usr/src/noir/tooling/noir_js/lib - name: test run: | - /usr/src/noir/.github/scripts/test-noir-codegen.sh \ No newline at end of file + /usr/src/noir/.github/scripts/test-noir-codegen.sh + + tests-end: + name: End + runs-on: ubuntu-latest + # We want this job to always run (even if the dependant jobs fail) as we want this job to fail rather than skipping. + if: ${{ always() }} + needs: + - test-noirc-abi + - test-source-resolver + - test-noir-wasm + - test-integration + + steps: + - name: Report overall success + run: | + if [[ $FAIL == true ]]; then + exit 1 + else + exit 0 + fi + env: + # We treat any skipped or failing jobs as a failure for the workflow as a whole. + FAIL: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'skipped') }} From 37af9e7b019be6365aa1b38514215d052e328a62 Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 20 Dec 2023 14:27:50 +0100 Subject: [PATCH 132/182] asdf --- .github/workflows/docker-test-flow.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index ea6c681bb5f..d136b6dfc95 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -379,6 +379,10 @@ jobs: name: noir_js path: /usr/src/noir/tooling/noir_js/lib + - name: Build noir_js_types + run: | + cd /usr/src/noir + yarn workspace @noir-lang/types build - name: test run: | /usr/src/noir/.github/scripts/test-noir-codegen.sh From 9f103a580377ad73b5a22b5c5a81635b4f7beb8a Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 20 Dec 2023 14:31:19 +0100 Subject: [PATCH 133/182] asdf --- .github/workflows/docker-test-flow.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index d136b6dfc95..48e24c96bae 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -383,6 +383,10 @@ jobs: run: | cd /usr/src/noir yarn workspace @noir-lang/types build + - name: Build noir_js + run: | + cd /usr/src/noir + yarn workspace @noir-lang/noir_js build - name: test run: | /usr/src/noir/.github/scripts/test-noir-codegen.sh From ce5cead6eeb206aea92501c61ee31822d0353632 Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 20 Dec 2023 14:59:34 +0100 Subject: [PATCH 134/182] asdf --- .github/workflows/docker-test-flow.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 48e24c96bae..04e16e57197 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -361,7 +361,7 @@ jobs: uses: actions/download-artifact@v4 with: name: noirc_abi_wasm - path: ./tooling/noirc_abi_wasm + path: /usr/src/noir/tooling/noirc_abi_wasm - name: Download acvm_js package artifact uses: actions/download-artifact@v4 with: @@ -379,14 +379,6 @@ jobs: name: noir_js path: /usr/src/noir/tooling/noir_js/lib - - name: Build noir_js_types - run: | - cd /usr/src/noir - yarn workspace @noir-lang/types build - - name: Build noir_js - run: | - cd /usr/src/noir - yarn workspace @noir-lang/noir_js build - name: test run: | /usr/src/noir/.github/scripts/test-noir-codegen.sh @@ -418,7 +410,7 @@ jobs: uses: actions/download-artifact@v4 with: name: noirc_abi_wasm - path: ./tooling/noirc_abi_wasm + path: /usr/src/noir/tooling/noirc_abi_wasm - name: Download acvm_js package artifact uses: actions/download-artifact@v4 with: From 05f6230f4ab6f7113bf89bee02c3047d7f82d1e9 Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 20 Dec 2023 15:36:57 +0100 Subject: [PATCH 135/182] asdf --- .github/workflows/docker-test-flow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 04e16e57197..ca6e883a638 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -366,7 +366,7 @@ jobs: uses: actions/download-artifact@v4 with: name: acvm_js - path: ./acvm-repo/acvm_js + path: /usr/src/noir/acvm-repo/acvm_js - name: artifact uses: actions/download-artifact@v4 with: @@ -415,7 +415,7 @@ jobs: uses: actions/download-artifact@v4 with: name: acvm_js - path: ./acvm-repo/acvm_js + path: /usr/src/noir/acvm-repo/acvm_js - name: Download noir js types uses: actions/download-artifact@v4 with: From 6d6c6093db54bb15f4650cc7c77e712094904583 Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 20 Dec 2023 16:11:49 +0100 Subject: [PATCH 136/182] asdf --- .github/workflows/docker-test-flow.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index ca6e883a638..c5e397446a9 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -367,12 +367,12 @@ jobs: with: name: acvm_js path: /usr/src/noir/acvm-repo/acvm_js - - name: artifact - uses: actions/download-artifact@v4 - with: - name: noir-js-types - path: | - /usr/src/noir/tooling/noir_js_types/lib + # - name: artifact + # uses: actions/download-artifact@v4 + # with: + # name: noir-js-types + # path: | + # /usr/src/noir/tooling/noir_js_types/lib - name: artifact uses: actions/download-artifact@v4 with: From 815ee3dcd573ecad525d6b23e169044174b3478f Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 20 Dec 2023 16:12:54 +0100 Subject: [PATCH 137/182] asdf --- .github/workflows/docker-test-flow.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index c5e397446a9..39ed749b66f 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -206,7 +206,6 @@ jobs: path: /usr/src/noir/compiler/wasm/outputs/out/noir_wasm retention-days: 3 - #DONE test-acvm_js: name: test acvm js runs-on: ubuntu-latest @@ -229,7 +228,6 @@ jobs: if-no-files-found: error compression-level: 0 - #DONE test-noirc-abi: name: test noirc abi runs-on: ubuntu-latest @@ -252,7 +250,6 @@ jobs: if-no-files-found: error compression-level: 0 - # DONE test-barretenberg-backend: name: test barretenberg backend runs-on: ubuntu-latest @@ -338,7 +335,6 @@ jobs: path: /usr/src/noir/tooling/noir_js/lib - # DONE test-noir_codegen: name: test noir codegen runs-on: ubuntu-latest @@ -435,13 +431,13 @@ jobs: tests-end: name: End runs-on: ubuntu-latest - # We want this job to always run (even if the dependant jobs fail) as we want this job to fail rather than skipping. if: ${{ always() }} needs: - test-noirc-abi - test-source-resolver - test-noir-wasm - test-integration + - test-noir_codegen steps: - name: Report overall success @@ -452,5 +448,4 @@ jobs: exit 0 fi env: - # We treat any skipped or failing jobs as a failure for the workflow as a whole. FAIL: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'skipped') }} From 520b4b25c46ce684e12c8ca06b57318d463686bd Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 20 Dec 2023 16:26:27 +0100 Subject: [PATCH 138/182] asdf --- .github/workflows/docker-test-flow.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 39ed749b66f..f36d3442f42 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -363,12 +363,12 @@ jobs: with: name: acvm_js path: /usr/src/noir/acvm-repo/acvm_js - # - name: artifact - # uses: actions/download-artifact@v4 - # with: - # name: noir-js-types - # path: | - # /usr/src/noir/tooling/noir_js_types/lib + - name: artifact + uses: actions/download-artifact@v4 + with: + name: noir-js-types + path: | + /usr/src/noir/tooling/noir_js_types/lib - name: artifact uses: actions/download-artifact@v4 with: From bc9f4b618a5c6246bd61a3b197c15a4ad3f9b100 Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 20 Dec 2023 16:59:05 +0100 Subject: [PATCH 139/182] asdf --- .github/workflows/docker-test-flow.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index f36d3442f42..84c5b3d573a 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -433,11 +433,16 @@ jobs: runs-on: ubuntu-latest if: ${{ always() }} needs: + - test-source-resolver + - test-nargo - test-noirc-abi - test-source-resolver - test-noir-wasm - test-integration - test-noir_codegen + - test-acvm_js + - test-barretenberg-backend + - test-noir_js steps: - name: Report overall success From 39c3eeee7842ab2a6306810a3e73459d89433840 Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 20 Dec 2023 20:27:16 +0100 Subject: [PATCH 140/182] asdf --- Dockerfile.ci | 97 +++------------------------------------------------ 1 file changed, 4 insertions(+), 93 deletions(-) diff --git a/Dockerfile.ci b/Dockerfile.ci index 7888249c730..68d59b86ada 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1,13 +1,13 @@ -FROM rust:1.71.1-slim-bookworm as base-base +FROM rust:1.71.1-slim-bookworm as base RUN apt-get update && apt-get upgrade -y && apt-get install build-essential git -y WORKDIR /usr/src/noir ENV PATH="${PATH}:/usr/src/noir/target/release" -FROM base-base as base-nargo +FROM base as base-nargo COPY . . RUN .github/scripts/build-nargo.sh -FROM base-base as base-js +FROM base as base-js RUN apt-get install -y ca-certificates curl gnupg RUN mkdir -p /etc/apt/keyrings RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg @@ -17,105 +17,16 @@ RUN corepack enable RUN apt-get install -y jq COPY yarn.lock package.json .yarnrc.yml ./ COPY .yarn/ ./.yarn/ -# acvm-js COPY ./acvm-repo/acvm_js/package.json ./acvm-repo/acvm_js/ -# noirc abi COPY ./tooling/noirc_abi_wasm/package.json ./tooling/noirc_abi_wasm/ -# noir wasm COPY ./compiler/wasm/package.json ./compiler/wasm/ -# source resolver COPY ./compiler/source-resolver/package.json ./compiler/source-resolver/ -#! Things rely on this COPY ./tooling/noir_js_types/package.json ./tooling/noir_js_types/ -#backend barretenberg COPY ./tooling/noir_js_backend_barretenberg/package.json ./tooling/noir_js_backend_barretenberg/ COPY ./tooling/noir_js/package.json ./tooling/noir_js/ COPY ./tooling/noir_codegen/package.json ./tooling/noir_codegen/ - -### NEW ADDED COPY ./compiler/integration-tests/package.json ./compiler/integration-tests/ COPY ./release-tests/package.json ./release-tests/ COPY ./docs/package.json ./docs/ - RUN yarn --immutable -# RUN yarn --immutable -COPY . . - -# #TEMP -# RUN .github/scripts/build-nargo.sh -# RUN ./scripts/install_wasm-bindgen-new.sh - - -FROM base-base as base -WORKDIR /usr/src/noir -COPY . . - -FROM base as intermediate -# Required for cargo test -RUN apt-get install -y curl libc++-dev - -# Required for js -RUN apt-get install -y ca-certificates curl gnupg -RUN mkdir -p /etc/apt/keyrings -RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg -RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list -RUN apt-get update && apt-get install nodejs -y -RUN corepack enable - -#Required for wasm bindgen -WORKDIR /usr/src/noir -COPY ./scripts/install_wasm-bindgen-new.sh ./scripts/install_wasm-bindgen-new.sh -RUN ./scripts/install_wasm-bindgen-new.sh - -#Required to build -COPY . . -RUN ./scripts/bootstrap_native.sh -ENV PATH="${PATH}:/usr/src/noir/target/release" - -#Required for yarn building -RUN yarn --immutable -RUN apt-get install -y jq -# RUN yarn build - -FROM test-base as test-cargo -RUN apt-get install -y curl libc++-dev -RUN ./scripts/test_native.sh - -FROM test-base as js-install -RUN apt-get install -y ca-certificates curl gnupg -RUN mkdir -p /etc/apt/keyrings -RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg -RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list -RUN apt-get update && apt-get install nodejs -y -RUN corepack enable - -FROM test-base as test-js -RUN apt-get install pkg-config libssl-dev -y -RUN ./scripts/install_wasm-bindgen.sh -RUN apt-get install -y ca-certificates curl gnupg -RUN mkdir -p /etc/apt/keyrings -RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg -RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list -RUN apt-get update && apt-get install nodejs -y -RUN corepack enable -RUN yarn --immutable -RUN apt-get install -y jq -RUN yarn build -# RUN yarn workspace @noir-lang/acvm_js test -# RUN npx playwright install && npx playwright install-deps -# RUN yarn workspace @noir-lang/acvm_js test:browser -# RUN yarn workspace @noir-lang/noirc_abi test -# RUN yarn workspace @noir-lang/noirc_abi test:browser -# RUN yarn workspace @noir-lang/backend_barretenberg test -RUN ./scripts/nargo_compile_noir_js_assert_lt.sh -RUN rm -rf /usr/src/noir/tooling/noir_js/test/noir_compiled_examples/assert_lt/target/debug_assert_lt.json -RUN yarn workspace @noir-lang/noir_js test -RUN yarn workspace @noir-lang/source-resolver test -# RUN ./scripts/nargo_compile_wasm_fixtures.sh -# RUN yarn workspace @noir-lang/noir_wasm test:node -# RUN yarn workspace @noir-lang/noir_wasm test:browser -RUN ./scripts/nargo_compile_noir_codegen_assert_lt.sh -RUN rm -rf /usr/src/noir/tooling/noir_codegen/test/assert_lt/target/debug_assert_lt.json -RUN yarn workspace @noir-lang/noir_codegen test -RUN apt-get install -y libc++-dev -RUN yarn test:integration +COPY . . \ No newline at end of file From de324346d57c7a14f3ef08146da5ea699dd273cb Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 20 Dec 2023 20:39:15 +0100 Subject: [PATCH 141/182] remove source resolver --- .github/workflows/docker-test-flow.yml | 32 +------------------------- Dockerfile.ci | 1 - 2 files changed, 1 insertion(+), 32 deletions(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 84c5b3d573a..22bef36c3f5 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -122,29 +122,6 @@ jobs: run: | /usr/src/noir/.github/scripts/test-nargo.sh - test-source-resolver: - name: test source resolver - runs-on: ubuntu-latest - needs: [build-base-js] - container: - image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - credentials: - username: ${{ github.actor }} - password: ${{ secrets.github_token }} - steps: - - name: test - run: | - /usr/src/noir/.github/scripts/test-source-resolver.sh - - name: artifact - uses: actions/upload-artifact@v4 - with: - name: source-resolver - path: | - /usr/src/noir/compiler/source-resolver/lib - /usr/src/noir/compiler/source-resolver/lib-node - /usr/src/noir/compiler/source-resolver/types - if-no-files-found: error - build-noir-js-types: name: build noir types runs-on: ubuntu-latest @@ -176,7 +153,7 @@ jobs: test-noir-wasm: name: test noir wasm runs-on: ubuntu-latest - needs: [build-base-js, test-source-resolver, artifact-nargo] + needs: [build-base-js, artifact-nargo] container: image: ghcr.io/noir-lang/noir:${{ github.sha }}-js credentials: @@ -191,11 +168,6 @@ jobs: - name: prep downloaded artifact run: | chmod +x /usr/src/noir/target/release/nargo - - name: download source-resolver - uses: actions/download-artifact@v4 - with: - name: source-resolver - path: /usr/src/noir/compiler/source-resolver - name: test run: | /usr/src/noir/.github/scripts/test-noir-wasm.sh @@ -433,10 +405,8 @@ jobs: runs-on: ubuntu-latest if: ${{ always() }} needs: - - test-source-resolver - test-nargo - test-noirc-abi - - test-source-resolver - test-noir-wasm - test-integration - test-noir_codegen diff --git a/Dockerfile.ci b/Dockerfile.ci index 68d59b86ada..1e23899638b 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -20,7 +20,6 @@ COPY .yarn/ ./.yarn/ COPY ./acvm-repo/acvm_js/package.json ./acvm-repo/acvm_js/ COPY ./tooling/noirc_abi_wasm/package.json ./tooling/noirc_abi_wasm/ COPY ./compiler/wasm/package.json ./compiler/wasm/ -COPY ./compiler/source-resolver/package.json ./compiler/source-resolver/ COPY ./tooling/noir_js_types/package.json ./tooling/noir_js_types/ COPY ./tooling/noir_js_backend_barretenberg/package.json ./tooling/noir_js_backend_barretenberg/ COPY ./tooling/noir_js/package.json ./tooling/noir_js/ From 8736d7ca9279e1fcf2293d4e70c9371b1320429f Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 20 Dec 2023 20:44:01 +0100 Subject: [PATCH 142/182] Remove feature flag --- .github/scripts/build-nargo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/build-nargo.sh b/.github/scripts/build-nargo.sh index 6d09d91ab33..92e2399f746 100755 --- a/.github/scripts/build-nargo.sh +++ b/.github/scripts/build-nargo.sh @@ -6,4 +6,4 @@ export SOURCE_DATE_EPOCH=$(date +%s) export GIT_DIRTY=false export GIT_COMMIT=$(git rev-parse --verify HEAD) -cargo build --features="noirc_driver/aztec" --release +cargo build --release From ac420d6b9ff3b6105b6e1283a4d8079faacb264d Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 20 Dec 2023 21:12:44 +0100 Subject: [PATCH 143/182] asdf --- .github/scripts/build-noir-wasm.sh | 6 +++++ .github/scripts/test-noir-wasm.sh | 2 -- .github/workflows/docker-test-flow.yml | 31 +++++++++++++++++++++----- 3 files changed, 31 insertions(+), 8 deletions(-) create mode 100644 .github/scripts/build-noir-wasm.sh diff --git a/.github/scripts/build-noir-wasm.sh b/.github/scripts/build-noir-wasm.sh new file mode 100644 index 00000000000..739efaa04a8 --- /dev/null +++ b/.github/scripts/build-noir-wasm.sh @@ -0,0 +1,6 @@ +#!/bin/bash +set -eu + +cd /usr/src/noir +./scripts/install_wasm-bindgen-new.sh +yarn workspace @noir-lang/noir_wasm build \ No newline at end of file diff --git a/.github/scripts/test-noir-wasm.sh b/.github/scripts/test-noir-wasm.sh index 8aa17a38baa..5321e257d3b 100755 --- a/.github/scripts/test-noir-wasm.sh +++ b/.github/scripts/test-noir-wasm.sh @@ -2,8 +2,6 @@ set -eu cd /usr/src/noir -./scripts/install_wasm-bindgen-new.sh -yarn workspace @noir-lang/noir_wasm build ./scripts/nargo_compile_wasm_fixtures.sh yarn workspace @noir-lang/noir_wasm test:node npx playwright install && npx playwright install-deps diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 22bef36c3f5..70b2a70ebca 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -150,6 +150,26 @@ jobs: if-no-files-found: error compression-level: 0 + build-noir-wasm: + name: build noir wasm + runs-on: ubuntu-latest + needs: [build-base-js] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: build + run: | + /usr/src/noir/.github/scripts/build-noir-wasm.sh + - name: Upload artifact + uses: actions/upload-artifact@v4 + with: + name: noir_wasm + path: /usr/src/noir/compiler/wasm/outputs/out/noir_wasm + retention-days: 10 + test-noir-wasm: name: test noir wasm runs-on: ubuntu-latest @@ -168,15 +188,14 @@ jobs: - name: prep downloaded artifact run: | chmod +x /usr/src/noir/target/release/nargo + - name: Download noirc_abi package artifact + uses: actions/download-artifact@v4 + with: + name: noirc_abi_wasm + path: /usr/src/noir/tooling/noirc_abi_wasm - name: test run: | /usr/src/noir/.github/scripts/test-noir-wasm.sh - - name: Upload artifact - uses: actions/upload-artifact@v4 - with: - name: noir_wasm - path: /usr/src/noir/compiler/wasm/outputs/out/noir_wasm - retention-days: 3 test-acvm_js: name: test acvm js From 18a694509f2e671cd7c327601f3b91d1e8bc8943 Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 20 Dec 2023 21:22:14 +0100 Subject: [PATCH 144/182] asdf --- .github/scripts/build-noir-wasm.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 .github/scripts/build-noir-wasm.sh diff --git a/.github/scripts/build-noir-wasm.sh b/.github/scripts/build-noir-wasm.sh old mode 100644 new mode 100755 From 749785018fabc8bb41835db90124be2434893da0 Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 20 Dec 2023 21:39:37 +0100 Subject: [PATCH 145/182] asdf --- .github/workflows/docker-test-flow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 70b2a70ebca..1ac147836d6 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -173,7 +173,7 @@ jobs: test-noir-wasm: name: test noir wasm runs-on: ubuntu-latest - needs: [build-base-js, artifact-nargo] + needs: [build-base-js, artifact-nargo, build-noir-wasm] container: image: ghcr.io/noir-lang/noir:${{ github.sha }}-js credentials: From 52edcac2fff0a8adbbc5dd02de363a8cb53cf888 Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 20 Dec 2023 22:13:26 +0100 Subject: [PATCH 146/182] fix --- .github/workflows/docker-test-flow.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 1ac147836d6..d94413550ba 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -188,11 +188,11 @@ jobs: - name: prep downloaded artifact run: | chmod +x /usr/src/noir/target/release/nargo - - name: Download noirc_abi package artifact + - name: Download noir_wasm package artifact uses: actions/download-artifact@v4 with: - name: noirc_abi_wasm - path: /usr/src/noir/tooling/noirc_abi_wasm + name: noir_wasm + path: /usr/src/noir/compiler/wasm - name: test run: | /usr/src/noir/.github/scripts/test-noir-wasm.sh From 46cf4ac4fd82321b0f9a2d6461b4f5ce2372bb2b Mon Sep 17 00:00:00 2001 From: Esau Date: Mon, 25 Dec 2023 13:26:50 +0100 Subject: [PATCH 147/182] test --- .github/scripts/acvm_js-build.sh | 6 + ...est-acvm_js.sh => acvm_js-test-browser.sh} | 3 - .github/scripts/acvm_js-test.sh | 5 + ...nberg.sh => backend-barretenberg-build.sh} | 1 - .github/scripts/backend-barretenberg-test.sh | 5 + .github/scripts/integration-tests-build.sh | 0 .github/scripts/integration-tests-test.sh | 0 .github/scripts/noir-codegen-build.sh | 5 + ...t-noir-codegen.sh => noir-codegen-test.sh} | 1 - .github/scripts/noir-js-build.sh | 5 + .../{test-noir-js.sh => noir-js-test.sh} | 1 - ...oir-js-types.sh => noir-js-types-build.sh} | 0 ...{build-noir-wasm.sh => noir-wasm-build.sh} | 0 .github/scripts/noir-wasm-test-browser.sh | 7 + .../{test-noir-wasm.sh => noir-wasm-test.sh} | 0 .github/scripts/noirc-abi-build.sh | 6 + ...noirc-abi.sh => noirc-abi-test-browser.sh} | 3 - .github/scripts/noirc-abi-test.sh | 5 + .github/scripts/test-source-resolver.sh | 6 - .github/workflows/docker-test-flow.yml | 363 +++++++++++++++--- Dockerfile.ci | 2 +- 21 files changed, 353 insertions(+), 71 deletions(-) create mode 100755 .github/scripts/acvm_js-build.sh rename .github/scripts/{test-acvm_js.sh => acvm_js-test-browser.sh} (54%) create mode 100755 .github/scripts/acvm_js-test.sh rename .github/scripts/{test-backend-barretenberg.sh => backend-barretenberg-build.sh} (64%) create mode 100755 .github/scripts/backend-barretenberg-test.sh create mode 100755 .github/scripts/integration-tests-build.sh create mode 100755 .github/scripts/integration-tests-test.sh create mode 100755 .github/scripts/noir-codegen-build.sh rename .github/scripts/{test-noir-codegen.sh => noir-codegen-test.sh} (82%) create mode 100755 .github/scripts/noir-js-build.sh rename .github/scripts/{test-noir-js.sh => noir-js-test.sh} (84%) rename .github/scripts/{build-noir-js-types.sh => noir-js-types-build.sh} (100%) rename .github/scripts/{build-noir-wasm.sh => noir-wasm-build.sh} (100%) create mode 100755 .github/scripts/noir-wasm-test-browser.sh rename .github/scripts/{test-noir-wasm.sh => noir-wasm-test.sh} (100%) create mode 100755 .github/scripts/noirc-abi-build.sh rename .github/scripts/{test-noirc-abi.sh => noirc-abi-test-browser.sh} (53%) create mode 100755 .github/scripts/noirc-abi-test.sh delete mode 100755 .github/scripts/test-source-resolver.sh diff --git a/.github/scripts/acvm_js-build.sh b/.github/scripts/acvm_js-build.sh new file mode 100755 index 00000000000..37ca141760f --- /dev/null +++ b/.github/scripts/acvm_js-build.sh @@ -0,0 +1,6 @@ +#!/bin/bash +set -eu + +cd /usr/src/noir +./scripts/install_wasm-bindgen-new.sh +yarn workspace @noir-lang/acvm_js build diff --git a/.github/scripts/test-acvm_js.sh b/.github/scripts/acvm_js-test-browser.sh similarity index 54% rename from .github/scripts/test-acvm_js.sh rename to .github/scripts/acvm_js-test-browser.sh index d78be25c400..169362f8843 100755 --- a/.github/scripts/test-acvm_js.sh +++ b/.github/scripts/acvm_js-test-browser.sh @@ -2,8 +2,5 @@ set -eu cd /usr/src/noir -./scripts/install_wasm-bindgen-new.sh -yarn workspace @noir-lang/acvm_js build -yarn workspace @noir-lang/acvm_js test npx playwright install && npx playwright install-deps yarn workspace @noir-lang/acvm_js test:browser diff --git a/.github/scripts/acvm_js-test.sh b/.github/scripts/acvm_js-test.sh new file mode 100755 index 00000000000..e42bb3b7243 --- /dev/null +++ b/.github/scripts/acvm_js-test.sh @@ -0,0 +1,5 @@ +#!/bin/bash +set -eu + +cd /usr/src/noir +yarn workspace @noir-lang/acvm_js test diff --git a/.github/scripts/test-backend-barretenberg.sh b/.github/scripts/backend-barretenberg-build.sh similarity index 64% rename from .github/scripts/test-backend-barretenberg.sh rename to .github/scripts/backend-barretenberg-build.sh index 8a53a2c1117..df311c408cd 100755 --- a/.github/scripts/test-backend-barretenberg.sh +++ b/.github/scripts/backend-barretenberg-build.sh @@ -3,4 +3,3 @@ set -eu cd /usr/src/noir yarn workspace @noir-lang/backend_barretenberg build -yarn workspace @noir-lang/backend_barretenberg test \ No newline at end of file diff --git a/.github/scripts/backend-barretenberg-test.sh b/.github/scripts/backend-barretenberg-test.sh new file mode 100755 index 00000000000..36476880c5f --- /dev/null +++ b/.github/scripts/backend-barretenberg-test.sh @@ -0,0 +1,5 @@ +#!/bin/bash +set -eu + +cd /usr/src/noir +yarn workspace @noir-lang/backend_barretenberg test diff --git a/.github/scripts/integration-tests-build.sh b/.github/scripts/integration-tests-build.sh new file mode 100755 index 00000000000..e69de29bb2d diff --git a/.github/scripts/integration-tests-test.sh b/.github/scripts/integration-tests-test.sh new file mode 100755 index 00000000000..e69de29bb2d diff --git a/.github/scripts/noir-codegen-build.sh b/.github/scripts/noir-codegen-build.sh new file mode 100755 index 00000000000..52ae4b147ff --- /dev/null +++ b/.github/scripts/noir-codegen-build.sh @@ -0,0 +1,5 @@ +#!/bin/bash +set -eu + +cd /usr/src/noir +yarn workspace @noir-lang/noir_codegen build diff --git a/.github/scripts/test-noir-codegen.sh b/.github/scripts/noir-codegen-test.sh similarity index 82% rename from .github/scripts/test-noir-codegen.sh rename to .github/scripts/noir-codegen-test.sh index fad0a22604b..f24d4191803 100755 --- a/.github/scripts/test-noir-codegen.sh +++ b/.github/scripts/noir-codegen-test.sh @@ -2,7 +2,6 @@ set -eu cd /usr/src/noir -yarn workspace @noir-lang/noir_codegen build ./scripts/nargo_compile_noir_codegen_assert_lt.sh rm -rf /usr/src/noir/tooling/noir_codegen/test/assert_lt/target/debug_assert_lt.json yarn workspace @noir-lang/noir_codegen test \ No newline at end of file diff --git a/.github/scripts/noir-js-build.sh b/.github/scripts/noir-js-build.sh new file mode 100755 index 00000000000..498c31aa36f --- /dev/null +++ b/.github/scripts/noir-js-build.sh @@ -0,0 +1,5 @@ +#!/bin/bash +set -eu + +cd /usr/src/noir +yarn workspace @noir-lang/noir_js build diff --git a/.github/scripts/test-noir-js.sh b/.github/scripts/noir-js-test.sh similarity index 84% rename from .github/scripts/test-noir-js.sh rename to .github/scripts/noir-js-test.sh index 7561699af4c..319c4f50c51 100755 --- a/.github/scripts/test-noir-js.sh +++ b/.github/scripts/noir-js-test.sh @@ -2,7 +2,6 @@ set -eu cd /usr/src/noir -yarn workspace @noir-lang/noir_js build ./scripts/nargo_compile_noir_js_assert_lt.sh rm -rf /usr/src/noir/tooling/noir_js/test/noir_compiled_examples/assert_lt/target/debug_assert_lt.json yarn workspace @noir-lang/noir_js test \ No newline at end of file diff --git a/.github/scripts/build-noir-js-types.sh b/.github/scripts/noir-js-types-build.sh similarity index 100% rename from .github/scripts/build-noir-js-types.sh rename to .github/scripts/noir-js-types-build.sh diff --git a/.github/scripts/build-noir-wasm.sh b/.github/scripts/noir-wasm-build.sh similarity index 100% rename from .github/scripts/build-noir-wasm.sh rename to .github/scripts/noir-wasm-build.sh diff --git a/.github/scripts/noir-wasm-test-browser.sh b/.github/scripts/noir-wasm-test-browser.sh new file mode 100755 index 00000000000..ac92b55835d --- /dev/null +++ b/.github/scripts/noir-wasm-test-browser.sh @@ -0,0 +1,7 @@ +#!/bin/bash +set -eu + +cd /usr/src/noir +./scripts/nargo_compile_wasm_fixtures.sh +npx playwright install && npx playwright install-deps +yarn workspace @noir-lang/noir_wasm test:browser \ No newline at end of file diff --git a/.github/scripts/test-noir-wasm.sh b/.github/scripts/noir-wasm-test.sh similarity index 100% rename from .github/scripts/test-noir-wasm.sh rename to .github/scripts/noir-wasm-test.sh diff --git a/.github/scripts/noirc-abi-build.sh b/.github/scripts/noirc-abi-build.sh new file mode 100755 index 00000000000..1fd747fca3a --- /dev/null +++ b/.github/scripts/noirc-abi-build.sh @@ -0,0 +1,6 @@ +#!/bin/bash +set -eu + +cd /usr/src/noir +./scripts/install_wasm-bindgen-new.sh +yarn workspace @noir-lang/noirc_abi build diff --git a/.github/scripts/test-noirc-abi.sh b/.github/scripts/noirc-abi-test-browser.sh similarity index 53% rename from .github/scripts/test-noirc-abi.sh rename to .github/scripts/noirc-abi-test-browser.sh index 6461741f25d..bcbef07a7d8 100755 --- a/.github/scripts/test-noirc-abi.sh +++ b/.github/scripts/noirc-abi-test-browser.sh @@ -2,8 +2,5 @@ set -eu cd /usr/src/noir -./scripts/install_wasm-bindgen-new.sh -yarn workspace @noir-lang/noirc_abi build -yarn workspace @noir-lang/noirc_abi test npx playwright install && npx playwright install-deps yarn workspace @noir-lang/noirc_abi test:browser diff --git a/.github/scripts/noirc-abi-test.sh b/.github/scripts/noirc-abi-test.sh new file mode 100755 index 00000000000..6f55bfed625 --- /dev/null +++ b/.github/scripts/noirc-abi-test.sh @@ -0,0 +1,5 @@ +#!/bin/bash +set -eu + +cd /usr/src/noir +yarn workspace @noir-lang/noirc_abi test diff --git a/.github/scripts/test-source-resolver.sh b/.github/scripts/test-source-resolver.sh deleted file mode 100755 index 31164759ec8..00000000000 --- a/.github/scripts/test-source-resolver.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -eu - -cd /usr/src/noir -yarn workspace @noir-lang/source-resolver build -yarn workspace @noir-lang/source-resolver test diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index d94413550ba..64428ca8626 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -11,8 +11,8 @@ concurrency: cancel-in-progress: true jobs: - build-base-js: - name: Build base js image + build-base-nargo: + name: Build base nargo runs-on: ubuntu-latest steps: - name: Checkout code @@ -26,8 +26,9 @@ jobs: REGISTRY="ghcr.io" IMG="${REGISTRY}/${{ github.repository }}" IMAGE=$(echo "$IMG" | tr '[:upper:]' '[:lower:]') - TAGS="${IMAGE}:${{ github.sha }}-js" - TAGS="${TAGS},${IMAGE}:latest-js,${IMAGE}:v${{ steps.date.outputs.date }}-js" + TAGS="${IMAGE}:${{ github.sha }}-nargo" + TAGS="${TAGS},${IMAGE}:latest-nargo,${IMAGE}:v${{ steps.date.outputs.date }}-nargo" + # echo ::set-output name=tags::${TAGS} echo "tags=$TAGS" >> $GITHUB_OUTPUT echo "image=$IMAGE" >> $GITHUB_OUTPUT - name: Set up Docker Buildx @@ -45,13 +46,13 @@ jobs: context: . file: Dockerfile.ci tags: ${{ steps.prep.outputs.tags }} - target: base-js + target: base-nargo cache-from: type=gha cache-to: type=gha,mode=max push: true - build-base-nargo: - name: Build base nargo + build-base-js: + name: Build base js image runs-on: ubuntu-latest steps: - name: Checkout code @@ -65,9 +66,8 @@ jobs: REGISTRY="ghcr.io" IMG="${REGISTRY}/${{ github.repository }}" IMAGE=$(echo "$IMG" | tr '[:upper:]' '[:lower:]') - TAGS="${IMAGE}:${{ github.sha }}-nargo" - TAGS="${TAGS},${IMAGE}:latest-nargo,${IMAGE}:v${{ steps.date.outputs.date }}-nargo" - # echo ::set-output name=tags::${TAGS} + TAGS="${IMAGE}:${{ github.sha }}-js" + TAGS="${TAGS},${IMAGE}:latest-js,${IMAGE}:v${{ steps.date.outputs.date }}-js" echo "tags=$TAGS" >> $GITHUB_OUTPUT echo "image=$IMAGE" >> $GITHUB_OUTPUT - name: Set up Docker Buildx @@ -85,7 +85,7 @@ jobs: context: . file: Dockerfile.ci tags: ${{ steps.prep.outputs.tags }} - target: base-nargo + target: base-js cache-from: type=gha cache-to: type=gha,mode=max push: true @@ -122,34 +122,6 @@ jobs: run: | /usr/src/noir/.github/scripts/test-nargo.sh - build-noir-js-types: - name: build noir types - runs-on: ubuntu-latest - needs: [build-base-js, test-noirc-abi] - container: - image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - credentials: - username: ${{ github.actor }} - password: ${{ secrets.github_token }} - steps: - - name: download artifact - uses: actions/download-artifact@v4 - with: - name: noirc_abi_wasm - path: | - /usr/src/noir/tooling/noirc_abi_wasm - - name: build - run: | - /usr/src/noir/.github/scripts/build-noir-js-types.sh - - name: artifact - uses: actions/upload-artifact@v4 - with: - name: noir-js-types - path: | - /usr/src/noir/tooling/noir_js_types/lib - if-no-files-found: error - compression-level: 0 - build-noir-wasm: name: build noir wasm runs-on: ubuntu-latest @@ -197,19 +169,46 @@ jobs: run: | /usr/src/noir/.github/scripts/test-noir-wasm.sh - test-acvm_js: - name: test acvm js + test-noir-wasm-browser: + name: test noir wasm browser runs-on: ubuntu-latest - needs: [build-base-js] + needs: [build-base-js, artifact-nargo, build-noir-wasm] container: image: ghcr.io/noir-lang/noir:${{ github.sha }}-js credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} steps: + - name: download nargo + uses: actions/download-artifact@v4 + with: + name: nargo + path: /usr/src/noir/target/release + - name: prep downloaded artifact + run: | + chmod +x /usr/src/noir/target/release/nargo + - name: Download noir_wasm package artifact + uses: actions/download-artifact@v4 + with: + name: noir_wasm + path: /usr/src/noir/compiler/wasm - name: test run: | - /usr/src/noir/.github/scripts/test-acvm_js.sh + /usr/src/noir/.github/scripts/noir-wasm-test-browser.sh + + build-acvm_js: + name: build acvm js + runs-on: ubuntu-latest + needs: [build-base-js] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: build + run: | + /usr/src/noir/.github/scripts/acvm_js-build.sh - name: artifact uses: actions/upload-artifact@v4 with: @@ -219,7 +218,75 @@ jobs: if-no-files-found: error compression-level: 0 - test-noirc-abi: + test-acvm_js: + name: test acvm js + runs-on: ubuntu-latest + needs: [build-base-js, build-acvm_js] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: download artifact + uses: actions/download-artifact@v4 + with: + name: acvm_js + path: | + /usr/src/noir/acvm-repo/acvm_js + - name: test + run: | + /usr/src/noir/.github/scripts/acvm_js-test.sh + + test-acvm_js-browser: + name: test acvm js browser + runs-on: ubuntu-latest + needs: [build-base-js, build-acvm_js] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: download artifact + uses: actions/download-artifact@v4 + with: + name: acvm_js + path: | + /usr/src/noir/acvm-repo/acvm_js + - name: test + run: | + /usr/src/noir/.github/scripts/acvm_js-test-browser.sh + + build-noir-js-types: + name: build noir types + runs-on: ubuntu-latest + needs: [build-base-js, test-noirc-abi] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: download artifact + uses: actions/download-artifact@v4 + with: + name: noirc_abi_wasm + path: | + /usr/src/noir/tooling/noirc_abi_wasm + - name: build + run: | + /usr/src/noir/.github/scripts/noir-js-types-build.sh + - name: artifact + uses: actions/upload-artifact@v4 + with: + name: noir-js-types + path: | + /usr/src/noir/tooling/noir_js_types/lib + if-no-files-found: error + compression-level: 0 + + build-noirc-abi: name: test noirc abi runs-on: ubuntu-latest needs: [build-base-js] @@ -229,9 +296,9 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.github_token }} steps: - - name: test + - name: build run: | - /usr/src/noir/.github/scripts/test-noirc-abi.sh + /usr/src/noir/.github/scripts/noirc-abi-build.sh - name: artifact uses: actions/upload-artifact@v4 with: @@ -241,8 +308,48 @@ jobs: if-no-files-found: error compression-level: 0 - test-barretenberg-backend: - name: test barretenberg backend + test-noirc-abi: + name: test noirc abi + runs-on: ubuntu-latest + 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 artifact + uses: actions/download-artifact@v4 + with: + name: noirc_abi_wasm + path: | + /usr/src/noir/tooling/noirc_abi_wasm + - name: test + run: | + /usr/src/noir/.github/scripts/noirc-abi-test.sh + + test-noirc-abi-browser: + name: test noirc abi browser + runs-on: ubuntu-latest + 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 artifact + uses: actions/download-artifact@v4 + with: + name: noirc_abi_wasm + path: | + /usr/src/noir/tooling/noirc_abi_wasm + - name: test + run: | + /usr/src/noir/.github/scripts/test-noirc-abi.sh + + build-barretenberg-backend: + name: build barretenberg backend runs-on: ubuntu-latest needs: [build-base-js, test-noirc-abi, build-noir-js-types] container: @@ -262,9 +369,9 @@ jobs: with: name: noir-js-types path: /usr/src/noir/tooling/noir_js_types/lib/ - - name: test + - name: build run: | - /usr/src/noir/.github/scripts/test-backend-barretenberg.sh + /usr/src/noir/.github/scripts/backend-barretenberg-build.sh - name: artifact uses: actions/upload-artifact@v4 with: @@ -274,10 +381,100 @@ jobs: if-no-files-found: error compression-level: 0 + test-barretenberg-backend: + name: test barretenberg backend + runs-on: ubuntu-latest + needs: [build-base-js, test-noirc-abi, build-noir-js-types] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: download artifact + uses: actions/download-artifact@v4 + with: + name: noirc_abi_wasm + path: | + /usr/src/noir/tooling/noirc_abi_wasm + - name: download noir js types + uses: actions/download-artifact@v4 + with: + name: noir-js-types + path: /usr/src/noir/tooling/noir_js_types/lib/ + - name: download backend barretenberg + uses: actions/download-artifact@v4 + with: + name: barretenberg-backend + path: + /usr/src/noir/tooling/noir_js_backend_barretenberg/lib + - name: test + run: | + /usr/src/noir/.github/scripts/backend-barretenberg-test.sh + + build-noir_js: + name: build noirjs + runs-on: ubuntu-latest + needs: [build-base-js, build-noirc-abi, artifact-nargo, build-acvm_js, build-barretenberg-backend, build-noir-js-types] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: download nargo + uses: actions/download-artifact@v4 + with: + name: nargo + path: /usr/src/noir/target/release + - name: prep downloaded artifact + run: | + chmod +x /usr/src/noir/target/release/nargo + - name: download artifact + uses: actions/download-artifact@v4 + with: + name: noirc_abi_wasm + path: | + /usr/src/noir/tooling/noirc_abi_wasm + - name: download artifact + uses: actions/download-artifact@v4 + with: + name: acvm_js + path: | + /usr/src/noir/acvm-repo/acvm_js + - name: artifact + uses: actions/download-artifact@v4 + with: + name: barretenberg-backend + path: + /usr/src/noir/tooling/noir_js_backend_barretenberg/lib + - name: artifact + uses: actions/download-artifact@v4 + with: + name: noir-js-types + path: | + /usr/src/noir/tooling/noir_js_types/lib + - name: build + run: | + /usr/src/noir/.github/scripts/build-noir-js.sh + - name: artifact + uses: actions/upload-artifact@v4 + with: + name: noir_js + path: + /usr/src/noir/tooling/noir_js/lib + test-noir_js: name: test noirjs runs-on: ubuntu-latest - needs: [build-base-js, test-noirc-abi, artifact-nargo, test-acvm_js, test-barretenberg-backend] + needs: [ + build-base-js, + build-noirc-abi, + artifact-nargo, + build-acvm_js, + build-barretenberg-backend, + build-noir_js + ] container: image: ghcr.io/noir-lang/noir:${{ github.sha }}-js credentials: @@ -316,16 +513,66 @@ jobs: name: noir-js-types path: | /usr/src/noir/tooling/noir_js_types/lib - - name: test - run: | - /usr/src/noir/.github/scripts/test-noir-js.sh - name: artifact uses: actions/upload-artifact@v4 with: name: noir_js path: /usr/src/noir/tooling/noir_js/lib + - name: test + run: | + /usr/src/noir/.github/scripts/noir-js-test.sh + build-noir_codegen: + name: build noir codegen + runs-on: ubuntu-latest + needs: [build-base-js, artifact-nargo, test-noirc-abi, test-acvm_js, build-noir-js-types, test-noir_js] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: download nargo + uses: actions/download-artifact@v4 + with: + name: nargo + path: /usr/src/noir/target/release + - name: prep downloaded artifact + run: | + chmod +x /usr/src/noir/target/release/nargo + - name: Download noirc_abi package artifact + uses: actions/download-artifact@v4 + with: + name: noirc_abi_wasm + path: /usr/src/noir/tooling/noirc_abi_wasm + - name: Download acvm_js package artifact + uses: actions/download-artifact@v4 + with: + name: acvm_js + path: /usr/src/noir/acvm-repo/acvm_js + - name: artifact + uses: actions/download-artifact@v4 + with: + name: noir-js-types + path: | + /usr/src/noir/tooling/noir_js_types/lib + - name: artifact + uses: actions/download-artifact@v4 + with: + name: noir_js + path: + /usr/src/noir/tooling/noir_js/lib + - name: build + run: | + /usr/src/noir/.github/scripts/noir-codegen-build.sh + - name: artifact + uses: actions/upload-artifact@v4 + with: + name: noir_codegen + path: + /usr/src/noir/tooling/noir_codegen/lib + test-noir_codegen: name: test noir codegen runs-on: ubuntu-latest @@ -366,9 +613,15 @@ jobs: name: noir_js path: /usr/src/noir/tooling/noir_js/lib + - name: artifact + uses: actions/download-artifact@v4 + with: + name: noir_codegen + path: + /usr/src/noir/tooling/noir_codegen/lib - name: test run: | - /usr/src/noir/.github/scripts/test-noir-codegen.sh + /usr/src/noir/.github/scripts/noir-codegen-test.sh test-integration: name: integration test diff --git a/Dockerfile.ci b/Dockerfile.ci index 1e23899638b..ee26a71f392 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -28,4 +28,4 @@ COPY ./compiler/integration-tests/package.json ./compiler/integration-tests/ COPY ./release-tests/package.json ./release-tests/ COPY ./docs/package.json ./docs/ RUN yarn --immutable -COPY . . \ No newline at end of file +COPY . . From c0a965e57bc5410291ccfbda1ba0df933f155bfd Mon Sep 17 00:00:00 2001 From: Esau Date: Mon, 25 Dec 2023 13:27:33 +0100 Subject: [PATCH 148/182] asdf --- .github/workflows/docker-test-flow.yml | 852 ++++++++++++------------- 1 file changed, 426 insertions(+), 426 deletions(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 64428ca8626..23aebecce49 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -258,441 +258,441 @@ jobs: run: | /usr/src/noir/.github/scripts/acvm_js-test-browser.sh - build-noir-js-types: - name: build noir types - runs-on: ubuntu-latest - needs: [build-base-js, test-noirc-abi] - container: - image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - credentials: - username: ${{ github.actor }} - password: ${{ secrets.github_token }} - steps: - - name: download artifact - uses: actions/download-artifact@v4 - with: - name: noirc_abi_wasm - path: | - /usr/src/noir/tooling/noirc_abi_wasm - - name: build - run: | - /usr/src/noir/.github/scripts/noir-js-types-build.sh - - name: artifact - uses: actions/upload-artifact@v4 - with: - name: noir-js-types - path: | - /usr/src/noir/tooling/noir_js_types/lib - if-no-files-found: error - compression-level: 0 + # build-noir-js-types: + # name: build noir types + # runs-on: ubuntu-latest + # needs: [build-base-js, test-noirc-abi] + # container: + # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + # credentials: + # username: ${{ github.actor }} + # password: ${{ secrets.github_token }} + # steps: + # - name: download artifact + # uses: actions/download-artifact@v4 + # with: + # name: noirc_abi_wasm + # path: | + # /usr/src/noir/tooling/noirc_abi_wasm + # - name: build + # run: | + # /usr/src/noir/.github/scripts/noir-js-types-build.sh + # - name: artifact + # uses: actions/upload-artifact@v4 + # with: + # name: noir-js-types + # path: | + # /usr/src/noir/tooling/noir_js_types/lib + # if-no-files-found: error + # compression-level: 0 - build-noirc-abi: - name: test noirc abi - runs-on: ubuntu-latest - needs: [build-base-js] - container: - image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - credentials: - username: ${{ github.actor }} - password: ${{ secrets.github_token }} - steps: - - name: build - run: | - /usr/src/noir/.github/scripts/noirc-abi-build.sh - - name: artifact - uses: actions/upload-artifact@v4 - with: - name: noirc_abi_wasm - path: - /usr/src/noir/tooling/noirc_abi_wasm/outputs/out/noirc_abi_wasm - if-no-files-found: error - compression-level: 0 + # build-noirc-abi: + # name: test noirc abi + # runs-on: ubuntu-latest + # needs: [build-base-js] + # container: + # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + # credentials: + # username: ${{ github.actor }} + # password: ${{ secrets.github_token }} + # steps: + # - name: build + # run: | + # /usr/src/noir/.github/scripts/noirc-abi-build.sh + # - name: artifact + # uses: actions/upload-artifact@v4 + # with: + # name: noirc_abi_wasm + # path: + # /usr/src/noir/tooling/noirc_abi_wasm/outputs/out/noirc_abi_wasm + # if-no-files-found: error + # compression-level: 0 - test-noirc-abi: - name: test noirc abi - runs-on: ubuntu-latest - 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 artifact - uses: actions/download-artifact@v4 - with: - name: noirc_abi_wasm - path: | - /usr/src/noir/tooling/noirc_abi_wasm - - name: test - run: | - /usr/src/noir/.github/scripts/noirc-abi-test.sh + # test-noirc-abi: + # name: test noirc abi + # runs-on: ubuntu-latest + # 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 artifact + # uses: actions/download-artifact@v4 + # with: + # name: noirc_abi_wasm + # path: | + # /usr/src/noir/tooling/noirc_abi_wasm + # - name: test + # run: | + # /usr/src/noir/.github/scripts/noirc-abi-test.sh - test-noirc-abi-browser: - name: test noirc abi browser - runs-on: ubuntu-latest - 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 artifact - uses: actions/download-artifact@v4 - with: - name: noirc_abi_wasm - path: | - /usr/src/noir/tooling/noirc_abi_wasm - - name: test - run: | - /usr/src/noir/.github/scripts/test-noirc-abi.sh + # test-noirc-abi-browser: + # name: test noirc abi browser + # runs-on: ubuntu-latest + # 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 artifact + # uses: actions/download-artifact@v4 + # with: + # name: noirc_abi_wasm + # path: | + # /usr/src/noir/tooling/noirc_abi_wasm + # - name: test + # run: | + # /usr/src/noir/.github/scripts/test-noirc-abi.sh - build-barretenberg-backend: - name: build barretenberg backend - runs-on: ubuntu-latest - needs: [build-base-js, test-noirc-abi, build-noir-js-types] - container: - image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - credentials: - username: ${{ github.actor }} - password: ${{ secrets.github_token }} - steps: - - name: download artifact - uses: actions/download-artifact@v4 - with: - name: noirc_abi_wasm - path: | - /usr/src/noir/tooling/noirc_abi_wasm - - name: download noir js types - uses: actions/download-artifact@v4 - with: - name: noir-js-types - path: /usr/src/noir/tooling/noir_js_types/lib/ - - name: build - run: | - /usr/src/noir/.github/scripts/backend-barretenberg-build.sh - - name: artifact - uses: actions/upload-artifact@v4 - with: - name: barretenberg-backend - path: - /usr/src/noir/tooling/noir_js_backend_barretenberg/lib - if-no-files-found: error - compression-level: 0 + # build-barretenberg-backend: + # name: build barretenberg backend + # runs-on: ubuntu-latest + # needs: [build-base-js, test-noirc-abi, build-noir-js-types] + # container: + # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + # credentials: + # username: ${{ github.actor }} + # password: ${{ secrets.github_token }} + # steps: + # - name: download artifact + # uses: actions/download-artifact@v4 + # with: + # name: noirc_abi_wasm + # path: | + # /usr/src/noir/tooling/noirc_abi_wasm + # - name: download noir js types + # uses: actions/download-artifact@v4 + # with: + # name: noir-js-types + # path: /usr/src/noir/tooling/noir_js_types/lib/ + # - name: build + # run: | + # /usr/src/noir/.github/scripts/backend-barretenberg-build.sh + # - name: artifact + # uses: actions/upload-artifact@v4 + # with: + # name: barretenberg-backend + # path: + # /usr/src/noir/tooling/noir_js_backend_barretenberg/lib + # if-no-files-found: error + # compression-level: 0 - test-barretenberg-backend: - name: test barretenberg backend - runs-on: ubuntu-latest - needs: [build-base-js, test-noirc-abi, build-noir-js-types] - container: - image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - credentials: - username: ${{ github.actor }} - password: ${{ secrets.github_token }} - steps: - - name: download artifact - uses: actions/download-artifact@v4 - with: - name: noirc_abi_wasm - path: | - /usr/src/noir/tooling/noirc_abi_wasm - - name: download noir js types - uses: actions/download-artifact@v4 - with: - name: noir-js-types - path: /usr/src/noir/tooling/noir_js_types/lib/ - - name: download backend barretenberg - uses: actions/download-artifact@v4 - with: - name: barretenberg-backend - path: - /usr/src/noir/tooling/noir_js_backend_barretenberg/lib - - name: test - run: | - /usr/src/noir/.github/scripts/backend-barretenberg-test.sh + # test-barretenberg-backend: + # name: test barretenberg backend + # runs-on: ubuntu-latest + # needs: [build-base-js, test-noirc-abi, build-noir-js-types] + # container: + # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + # credentials: + # username: ${{ github.actor }} + # password: ${{ secrets.github_token }} + # steps: + # - name: download artifact + # uses: actions/download-artifact@v4 + # with: + # name: noirc_abi_wasm + # path: | + # /usr/src/noir/tooling/noirc_abi_wasm + # - name: download noir js types + # uses: actions/download-artifact@v4 + # with: + # name: noir-js-types + # path: /usr/src/noir/tooling/noir_js_types/lib/ + # - name: download backend barretenberg + # uses: actions/download-artifact@v4 + # with: + # name: barretenberg-backend + # path: + # /usr/src/noir/tooling/noir_js_backend_barretenberg/lib + # - name: test + # run: | + # /usr/src/noir/.github/scripts/backend-barretenberg-test.sh - build-noir_js: - name: build noirjs - runs-on: ubuntu-latest - needs: [build-base-js, build-noirc-abi, artifact-nargo, build-acvm_js, build-barretenberg-backend, build-noir-js-types] - container: - image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - credentials: - username: ${{ github.actor }} - password: ${{ secrets.github_token }} - steps: - - name: download nargo - uses: actions/download-artifact@v4 - with: - name: nargo - path: /usr/src/noir/target/release - - name: prep downloaded artifact - run: | - chmod +x /usr/src/noir/target/release/nargo - - name: download artifact - uses: actions/download-artifact@v4 - with: - name: noirc_abi_wasm - path: | - /usr/src/noir/tooling/noirc_abi_wasm - - name: download artifact - uses: actions/download-artifact@v4 - with: - name: acvm_js - path: | - /usr/src/noir/acvm-repo/acvm_js - - name: artifact - uses: actions/download-artifact@v4 - with: - name: barretenberg-backend - path: - /usr/src/noir/tooling/noir_js_backend_barretenberg/lib - - name: artifact - uses: actions/download-artifact@v4 - with: - name: noir-js-types - path: | - /usr/src/noir/tooling/noir_js_types/lib - - name: build - run: | - /usr/src/noir/.github/scripts/build-noir-js.sh - - name: artifact - uses: actions/upload-artifact@v4 - with: - name: noir_js - path: - /usr/src/noir/tooling/noir_js/lib + # build-noir_js: + # name: build noirjs + # runs-on: ubuntu-latest + # needs: [build-base-js, build-noirc-abi, artifact-nargo, build-acvm_js, build-barretenberg-backend, build-noir-js-types] + # container: + # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + # credentials: + # username: ${{ github.actor }} + # password: ${{ secrets.github_token }} + # steps: + # - name: download nargo + # uses: actions/download-artifact@v4 + # with: + # name: nargo + # path: /usr/src/noir/target/release + # - name: prep downloaded artifact + # run: | + # chmod +x /usr/src/noir/target/release/nargo + # - name: download artifact + # uses: actions/download-artifact@v4 + # with: + # name: noirc_abi_wasm + # path: | + # /usr/src/noir/tooling/noirc_abi_wasm + # - name: download artifact + # uses: actions/download-artifact@v4 + # with: + # name: acvm_js + # path: | + # /usr/src/noir/acvm-repo/acvm_js + # - name: artifact + # uses: actions/download-artifact@v4 + # with: + # name: barretenberg-backend + # path: + # /usr/src/noir/tooling/noir_js_backend_barretenberg/lib + # - name: artifact + # uses: actions/download-artifact@v4 + # with: + # name: noir-js-types + # path: | + # /usr/src/noir/tooling/noir_js_types/lib + # - name: build + # run: | + # /usr/src/noir/.github/scripts/build-noir-js.sh + # - name: artifact + # uses: actions/upload-artifact@v4 + # with: + # name: noir_js + # path: + # /usr/src/noir/tooling/noir_js/lib - test-noir_js: - name: test noirjs - runs-on: ubuntu-latest - needs: [ - build-base-js, - build-noirc-abi, - artifact-nargo, - build-acvm_js, - build-barretenberg-backend, - build-noir_js - ] - container: - image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - credentials: - username: ${{ github.actor }} - password: ${{ secrets.github_token }} - steps: - - name: download nargo - uses: actions/download-artifact@v4 - with: - name: nargo - path: /usr/src/noir/target/release - - name: prep downloaded artifact - run: | - chmod +x /usr/src/noir/target/release/nargo - - name: download artifact - uses: actions/download-artifact@v4 - with: - name: noirc_abi_wasm - path: | - /usr/src/noir/tooling/noirc_abi_wasm - - name: download artifact - uses: actions/download-artifact@v4 - with: - name: acvm_js - path: | - /usr/src/noir/acvm-repo/acvm_js - - name: artifact - uses: actions/download-artifact@v4 - with: - name: barretenberg-backend - path: - /usr/src/noir/tooling/noir_js_backend_barretenberg/lib - - name: artifact - uses: actions/download-artifact@v4 - with: - name: noir-js-types - path: | - /usr/src/noir/tooling/noir_js_types/lib - - name: artifact - uses: actions/upload-artifact@v4 - with: - name: noir_js - path: - /usr/src/noir/tooling/noir_js/lib - - name: test - run: | - /usr/src/noir/.github/scripts/noir-js-test.sh + # test-noir_js: + # name: test noirjs + # runs-on: ubuntu-latest + # needs: [ + # build-base-js, + # build-noirc-abi, + # artifact-nargo, + # build-acvm_js, + # build-barretenberg-backend, + # build-noir_js + # ] + # container: + # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + # credentials: + # username: ${{ github.actor }} + # password: ${{ secrets.github_token }} + # steps: + # - name: download nargo + # uses: actions/download-artifact@v4 + # with: + # name: nargo + # path: /usr/src/noir/target/release + # - name: prep downloaded artifact + # run: | + # chmod +x /usr/src/noir/target/release/nargo + # - name: download artifact + # uses: actions/download-artifact@v4 + # with: + # name: noirc_abi_wasm + # path: | + # /usr/src/noir/tooling/noirc_abi_wasm + # - name: download artifact + # uses: actions/download-artifact@v4 + # with: + # name: acvm_js + # path: | + # /usr/src/noir/acvm-repo/acvm_js + # - name: artifact + # uses: actions/download-artifact@v4 + # with: + # name: barretenberg-backend + # path: + # /usr/src/noir/tooling/noir_js_backend_barretenberg/lib + # - name: artifact + # uses: actions/download-artifact@v4 + # with: + # name: noir-js-types + # path: | + # /usr/src/noir/tooling/noir_js_types/lib + # - name: artifact + # uses: actions/upload-artifact@v4 + # with: + # name: noir_js + # path: + # /usr/src/noir/tooling/noir_js/lib + # - name: test + # run: | + # /usr/src/noir/.github/scripts/noir-js-test.sh - build-noir_codegen: - name: build noir codegen - runs-on: ubuntu-latest - needs: [build-base-js, artifact-nargo, test-noirc-abi, test-acvm_js, build-noir-js-types, test-noir_js] - container: - image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - credentials: - username: ${{ github.actor }} - password: ${{ secrets.github_token }} - steps: - - name: download nargo - uses: actions/download-artifact@v4 - with: - name: nargo - path: /usr/src/noir/target/release - - name: prep downloaded artifact - run: | - chmod +x /usr/src/noir/target/release/nargo - - name: Download noirc_abi package artifact - uses: actions/download-artifact@v4 - with: - name: noirc_abi_wasm - path: /usr/src/noir/tooling/noirc_abi_wasm - - name: Download acvm_js package artifact - uses: actions/download-artifact@v4 - with: - name: acvm_js - path: /usr/src/noir/acvm-repo/acvm_js - - name: artifact - uses: actions/download-artifact@v4 - with: - name: noir-js-types - path: | - /usr/src/noir/tooling/noir_js_types/lib - - name: artifact - uses: actions/download-artifact@v4 - with: - name: noir_js - path: - /usr/src/noir/tooling/noir_js/lib - - name: build - run: | - /usr/src/noir/.github/scripts/noir-codegen-build.sh - - name: artifact - uses: actions/upload-artifact@v4 - with: - name: noir_codegen - path: - /usr/src/noir/tooling/noir_codegen/lib + # build-noir_codegen: + # name: build noir codegen + # runs-on: ubuntu-latest + # needs: [build-base-js, artifact-nargo, test-noirc-abi, test-acvm_js, build-noir-js-types, test-noir_js] + # container: + # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + # credentials: + # username: ${{ github.actor }} + # password: ${{ secrets.github_token }} + # steps: + # - name: download nargo + # uses: actions/download-artifact@v4 + # with: + # name: nargo + # path: /usr/src/noir/target/release + # - name: prep downloaded artifact + # run: | + # chmod +x /usr/src/noir/target/release/nargo + # - name: Download noirc_abi package artifact + # uses: actions/download-artifact@v4 + # with: + # name: noirc_abi_wasm + # path: /usr/src/noir/tooling/noirc_abi_wasm + # - name: Download acvm_js package artifact + # uses: actions/download-artifact@v4 + # with: + # name: acvm_js + # path: /usr/src/noir/acvm-repo/acvm_js + # - name: artifact + # uses: actions/download-artifact@v4 + # with: + # name: noir-js-types + # path: | + # /usr/src/noir/tooling/noir_js_types/lib + # - name: artifact + # uses: actions/download-artifact@v4 + # with: + # name: noir_js + # path: + # /usr/src/noir/tooling/noir_js/lib + # - name: build + # run: | + # /usr/src/noir/.github/scripts/noir-codegen-build.sh + # - name: artifact + # uses: actions/upload-artifact@v4 + # with: + # name: noir_codegen + # path: + # /usr/src/noir/tooling/noir_codegen/lib - test-noir_codegen: - name: test noir codegen - runs-on: ubuntu-latest - needs: [build-base-js, artifact-nargo, test-noirc-abi, test-acvm_js, build-noir-js-types, test-noir_js] - container: - image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - credentials: - username: ${{ github.actor }} - password: ${{ secrets.github_token }} - steps: - - name: download nargo - uses: actions/download-artifact@v4 - with: - name: nargo - path: /usr/src/noir/target/release - - name: prep downloaded artifact - run: | - chmod +x /usr/src/noir/target/release/nargo - - name: Download noirc_abi package artifact - uses: actions/download-artifact@v4 - with: - name: noirc_abi_wasm - path: /usr/src/noir/tooling/noirc_abi_wasm - - name: Download acvm_js package artifact - uses: actions/download-artifact@v4 - with: - name: acvm_js - path: /usr/src/noir/acvm-repo/acvm_js - - name: artifact - uses: actions/download-artifact@v4 - with: - name: noir-js-types - path: | - /usr/src/noir/tooling/noir_js_types/lib - - name: artifact - uses: actions/download-artifact@v4 - with: - name: noir_js - path: - /usr/src/noir/tooling/noir_js/lib - - name: artifact - uses: actions/download-artifact@v4 - with: - name: noir_codegen - path: - /usr/src/noir/tooling/noir_codegen/lib - - name: test - run: | - /usr/src/noir/.github/scripts/noir-codegen-test.sh + # test-noir_codegen: + # name: test noir codegen + # runs-on: ubuntu-latest + # needs: [build-base-js, artifact-nargo, test-noirc-abi, test-acvm_js, build-noir-js-types, test-noir_js] + # container: + # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + # credentials: + # username: ${{ github.actor }} + # password: ${{ secrets.github_token }} + # steps: + # - name: download nargo + # uses: actions/download-artifact@v4 + # with: + # name: nargo + # path: /usr/src/noir/target/release + # - name: prep downloaded artifact + # run: | + # chmod +x /usr/src/noir/target/release/nargo + # - name: Download noirc_abi package artifact + # uses: actions/download-artifact@v4 + # with: + # name: noirc_abi_wasm + # path: /usr/src/noir/tooling/noirc_abi_wasm + # - name: Download acvm_js package artifact + # uses: actions/download-artifact@v4 + # with: + # name: acvm_js + # path: /usr/src/noir/acvm-repo/acvm_js + # - name: artifact + # uses: actions/download-artifact@v4 + # with: + # name: noir-js-types + # path: | + # /usr/src/noir/tooling/noir_js_types/lib + # - name: artifact + # uses: actions/download-artifact@v4 + # with: + # name: noir_js + # path: + # /usr/src/noir/tooling/noir_js/lib + # - name: artifact + # uses: actions/download-artifact@v4 + # with: + # name: noir_codegen + # path: + # /usr/src/noir/tooling/noir_codegen/lib + # - name: test + # run: | + # /usr/src/noir/.github/scripts/noir-codegen-test.sh - test-integration: - name: integration test - runs-on: ubuntu-latest - needs: [build-base-js, artifact-nargo, test-noir-wasm, test-noirc-abi, test-acvm_js, build-noir-js-types, test-noir_js] - container: - image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - credentials: - username: ${{ github.actor }} - password: ${{ secrets.github_token }} - steps: - - name: download nargo - uses: actions/download-artifact@v4 - with: - name: nargo - path: /usr/src/noir/target/release - - name: prep downloaded artifact - run: | - chmod +x /usr/src/noir/target/release/nargo - - name: Upload artifact - uses: actions/download-artifact@v4 - with: - name: noir_wasm - path: /usr/src/noir/compiler/wasm/outputs/out/noir_wasm - - name: Download noirc_abi package artifact - uses: actions/download-artifact@v4 - with: - name: noirc_abi_wasm - path: /usr/src/noir/tooling/noirc_abi_wasm - - name: Download acvm_js package artifact - uses: actions/download-artifact@v4 - with: - name: acvm_js - path: /usr/src/noir/acvm-repo/acvm_js - - name: Download noir js types - uses: actions/download-artifact@v4 - with: - name: noir-js-types - path: | - /usr/src/noir/tooling/noir_js_types/lib - - name: Download noir js - uses: actions/download-artifact@v4 - with: - name: noir_js - path: - /usr/src/noir/tooling/noir_js/lib - - name: test - run: | - /usr/src/noir/.github/scripts/test-noir-codegen.sh + # test-integration: + # name: integration test + # runs-on: ubuntu-latest + # needs: [build-base-js, artifact-nargo, test-noir-wasm, test-noirc-abi, test-acvm_js, build-noir-js-types, test-noir_js] + # container: + # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + # credentials: + # username: ${{ github.actor }} + # password: ${{ secrets.github_token }} + # steps: + # - name: download nargo + # uses: actions/download-artifact@v4 + # with: + # name: nargo + # path: /usr/src/noir/target/release + # - name: prep downloaded artifact + # run: | + # chmod +x /usr/src/noir/target/release/nargo + # - name: Upload artifact + # uses: actions/download-artifact@v4 + # with: + # name: noir_wasm + # path: /usr/src/noir/compiler/wasm/outputs/out/noir_wasm + # - name: Download noirc_abi package artifact + # uses: actions/download-artifact@v4 + # with: + # name: noirc_abi_wasm + # path: /usr/src/noir/tooling/noirc_abi_wasm + # - name: Download acvm_js package artifact + # uses: actions/download-artifact@v4 + # with: + # name: acvm_js + # path: /usr/src/noir/acvm-repo/acvm_js + # - name: Download noir js types + # uses: actions/download-artifact@v4 + # with: + # name: noir-js-types + # path: | + # /usr/src/noir/tooling/noir_js_types/lib + # - name: Download noir js + # uses: actions/download-artifact@v4 + # with: + # name: noir_js + # path: + # /usr/src/noir/tooling/noir_js/lib + # - name: test + # run: | + # /usr/src/noir/.github/scripts/test-noir-codegen.sh - tests-end: - name: End - runs-on: ubuntu-latest - if: ${{ always() }} - needs: - - test-nargo - - test-noirc-abi - - test-noir-wasm - - test-integration - - test-noir_codegen - - test-acvm_js - - test-barretenberg-backend - - test-noir_js + # tests-end: + # name: End + # runs-on: ubuntu-latest + # if: ${{ always() }} + # needs: + # - test-nargo + # - test-noirc-abi + # - test-noir-wasm + # - test-integration + # - test-noir_codegen + # - test-acvm_js + # - test-barretenberg-backend + # - test-noir_js - steps: - - name: Report overall success - run: | - if [[ $FAIL == true ]]; then - exit 1 - else - exit 0 - fi - env: - FAIL: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'skipped') }} + # steps: + # - name: Report overall success + # run: | + # if [[ $FAIL == true ]]; then + # exit 1 + # else + # exit 0 + # fi + # env: + # FAIL: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'skipped') }} From 710e0a360c69d5a768bb194becdbc2348ac39c95 Mon Sep 17 00:00:00 2001 From: Esau Date: Mon, 25 Dec 2023 13:35:03 +0100 Subject: [PATCH 149/182] asdf --- .github/workflows/docker-test-flow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 23aebecce49..b699d2e9a49 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -134,7 +134,7 @@ jobs: steps: - name: build run: | - /usr/src/noir/.github/scripts/build-noir-wasm.sh + /usr/src/noir/.github/scripts/noir-wasm-build.sh - name: Upload artifact uses: actions/upload-artifact@v4 with: From 585de8f9171400eef040a4f3da131ce9a34a69e7 Mon Sep 17 00:00:00 2001 From: Esau Date: Mon, 25 Dec 2023 15:44:21 +0100 Subject: [PATCH 150/182] asdf --- .github/workflows/docker-test-flow.yml | 126 ++++++++++++------------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index b699d2e9a49..7f5fa513247 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -167,7 +167,7 @@ jobs: path: /usr/src/noir/compiler/wasm - name: test run: | - /usr/src/noir/.github/scripts/test-noir-wasm.sh + /usr/src/noir/.github/scripts/noir-wasm-test.sh test-noir-wasm-browser: name: test noir wasm browser @@ -258,6 +258,68 @@ jobs: run: | /usr/src/noir/.github/scripts/acvm_js-test-browser.sh + build-noirc-abi: + name: build noirc abi + runs-on: ubuntu-latest + needs: [build-base-js] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: build + run: | + /usr/src/noir/.github/scripts/noirc-abi-build.sh + - name: artifact + uses: actions/upload-artifact@v4 + with: + name: noirc_abi_wasm + path: + /usr/src/noir/tooling/noirc_abi_wasm/outputs/out/noirc_abi_wasm + if-no-files-found: error + compression-level: 0 + + test-noirc-abi: + name: test noirc abi + runs-on: ubuntu-latest + 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 artifact + uses: actions/download-artifact@v4 + with: + name: noirc_abi_wasm + path: | + /usr/src/noir/tooling/noirc_abi_wasm + - name: test + run: | + /usr/src/noir/.github/scripts/noirc-abi-test.sh + + test-noirc-abi-browser: + name: test noirc abi browser + runs-on: ubuntu-latest + 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 artifact + uses: actions/download-artifact@v4 + with: + name: noirc_abi_wasm + path: | + /usr/src/noir/tooling/noirc_abi_wasm + - name: test + run: | + /usr/src/noir/.github/scripts/noirc-abi-test-browser.sh + # build-noir-js-types: # name: build noir types # runs-on: ubuntu-latest @@ -286,68 +348,6 @@ jobs: # if-no-files-found: error # compression-level: 0 - # build-noirc-abi: - # name: test noirc abi - # runs-on: ubuntu-latest - # needs: [build-base-js] - # container: - # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - # credentials: - # username: ${{ github.actor }} - # password: ${{ secrets.github_token }} - # steps: - # - name: build - # run: | - # /usr/src/noir/.github/scripts/noirc-abi-build.sh - # - name: artifact - # uses: actions/upload-artifact@v4 - # with: - # name: noirc_abi_wasm - # path: - # /usr/src/noir/tooling/noirc_abi_wasm/outputs/out/noirc_abi_wasm - # if-no-files-found: error - # compression-level: 0 - - # test-noirc-abi: - # name: test noirc abi - # runs-on: ubuntu-latest - # 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 artifact - # uses: actions/download-artifact@v4 - # with: - # name: noirc_abi_wasm - # path: | - # /usr/src/noir/tooling/noirc_abi_wasm - # - name: test - # run: | - # /usr/src/noir/.github/scripts/noirc-abi-test.sh - - # test-noirc-abi-browser: - # name: test noirc abi browser - # runs-on: ubuntu-latest - # 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 artifact - # uses: actions/download-artifact@v4 - # with: - # name: noirc_abi_wasm - # path: | - # /usr/src/noir/tooling/noirc_abi_wasm - # - name: test - # run: | - # /usr/src/noir/.github/scripts/test-noirc-abi.sh - # build-barretenberg-backend: # name: build barretenberg backend # runs-on: ubuntu-latest From 47c444c6421fd499d091a7d61f383c15ea60612e Mon Sep 17 00:00:00 2001 From: Esau Date: Mon, 25 Dec 2023 16:00:54 +0100 Subject: [PATCH 151/182] asdf --- .github/workflows/docker-test-flow.yml | 178 ++++++++++++------------- 1 file changed, 89 insertions(+), 89 deletions(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 7f5fa513247..b6217cad1fc 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -320,97 +320,97 @@ jobs: run: | /usr/src/noir/.github/scripts/noirc-abi-test-browser.sh - # build-noir-js-types: - # name: build noir types - # runs-on: ubuntu-latest - # needs: [build-base-js, test-noirc-abi] - # container: - # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - # credentials: - # username: ${{ github.actor }} - # password: ${{ secrets.github_token }} - # steps: - # - name: download artifact - # uses: actions/download-artifact@v4 - # with: - # name: noirc_abi_wasm - # path: | - # /usr/src/noir/tooling/noirc_abi_wasm - # - name: build - # run: | - # /usr/src/noir/.github/scripts/noir-js-types-build.sh - # - name: artifact - # uses: actions/upload-artifact@v4 - # with: - # name: noir-js-types - # path: | - # /usr/src/noir/tooling/noir_js_types/lib - # if-no-files-found: error - # compression-level: 0 + build-noir-js-types: + name: build noir types + runs-on: ubuntu-latest + 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 artifact + uses: actions/download-artifact@v4 + with: + name: noirc_abi_wasm + path: | + /usr/src/noir/tooling/noirc_abi_wasm + - name: build + run: | + /usr/src/noir/.github/scripts/noir-js-types-build.sh + - name: artifact + uses: actions/upload-artifact@v4 + with: + name: noir-js-types + path: | + /usr/src/noir/tooling/noir_js_types/lib + if-no-files-found: error + compression-level: 0 - # build-barretenberg-backend: - # name: build barretenberg backend - # runs-on: ubuntu-latest - # needs: [build-base-js, test-noirc-abi, build-noir-js-types] - # container: - # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - # credentials: - # username: ${{ github.actor }} - # password: ${{ secrets.github_token }} - # steps: - # - name: download artifact - # uses: actions/download-artifact@v4 - # with: - # name: noirc_abi_wasm - # path: | - # /usr/src/noir/tooling/noirc_abi_wasm - # - name: download noir js types - # uses: actions/download-artifact@v4 - # with: - # name: noir-js-types - # path: /usr/src/noir/tooling/noir_js_types/lib/ - # - name: build - # run: | - # /usr/src/noir/.github/scripts/backend-barretenberg-build.sh - # - name: artifact - # uses: actions/upload-artifact@v4 - # with: - # name: barretenberg-backend - # path: - # /usr/src/noir/tooling/noir_js_backend_barretenberg/lib - # if-no-files-found: error - # compression-level: 0 + build-barretenberg-backend: + name: build barretenberg backend + runs-on: ubuntu-latest + needs: [build-base-js, build-noirc-abi, build-noir-js-types] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: download artifact + uses: actions/download-artifact@v4 + with: + name: noirc_abi_wasm + path: | + /usr/src/noir/tooling/noirc_abi_wasm + - name: download noir js types + uses: actions/download-artifact@v4 + with: + name: noir-js-types + path: /usr/src/noir/tooling/noir_js_types/lib/ + - name: build + run: | + /usr/src/noir/.github/scripts/backend-barretenberg-build.sh + - name: artifact + uses: actions/upload-artifact@v4 + with: + name: barretenberg-backend + path: + /usr/src/noir/tooling/noir_js_backend_barretenberg/lib + if-no-files-found: error + compression-level: 0 - # test-barretenberg-backend: - # name: test barretenberg backend - # runs-on: ubuntu-latest - # needs: [build-base-js, test-noirc-abi, build-noir-js-types] - # container: - # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - # credentials: - # username: ${{ github.actor }} - # password: ${{ secrets.github_token }} - # steps: - # - name: download artifact - # uses: actions/download-artifact@v4 - # with: - # name: noirc_abi_wasm - # path: | - # /usr/src/noir/tooling/noirc_abi_wasm - # - name: download noir js types - # uses: actions/download-artifact@v4 - # with: - # name: noir-js-types - # path: /usr/src/noir/tooling/noir_js_types/lib/ - # - name: download backend barretenberg - # uses: actions/download-artifact@v4 - # with: - # name: barretenberg-backend - # path: - # /usr/src/noir/tooling/noir_js_backend_barretenberg/lib - # - name: test - # run: | - # /usr/src/noir/.github/scripts/backend-barretenberg-test.sh + test-barretenberg-backend: + name: test barretenberg backend + runs-on: ubuntu-latest + needs: [build-base-js, build-noirc-abi, build-noir-js-types] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + # - name: download artifact + # uses: actions/download-artifact@v4 + # with: + # name: noirc_abi_wasm + # path: | + # /usr/src/noir/tooling/noirc_abi_wasm + # - name: download noir js types + # uses: actions/download-artifact@v4 + # with: + # name: noir-js-types + # path: /usr/src/noir/tooling/noir_js_types/lib/ + - name: download backend barretenberg + uses: actions/download-artifact@v4 + with: + name: barretenberg-backend + path: + /usr/src/noir/tooling/noir_js_backend_barretenberg/lib + - name: test + run: | + /usr/src/noir/.github/scripts/backend-barretenberg-test.sh # build-noir_js: # name: build noirjs From 86d852ec48e490642d4dc7c8caa2a659d64210b8 Mon Sep 17 00:00:00 2001 From: Esau Date: Mon, 25 Dec 2023 16:07:33 +0100 Subject: [PATCH 152/182] asdf asdf --- .github/workflows/docker-test-flow.yml | 6 +++--- Dockerfile.ci | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index b6217cad1fc..6c500aa906d 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -157,9 +157,9 @@ jobs: with: name: nargo path: /usr/src/noir/target/release - - name: prep downloaded artifact - run: | - chmod +x /usr/src/noir/target/release/nargo + # - name: prep downloaded artifact + # run: | + # chmod +x /usr/src/noir/target/release/nargo - name: Download noir_wasm package artifact uses: actions/download-artifact@v4 with: diff --git a/Dockerfile.ci b/Dockerfile.ci index ee26a71f392..03fc0d02f5a 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -6,6 +6,7 @@ ENV PATH="${PATH}:/usr/src/noir/target/release" FROM base as base-nargo COPY . . RUN .github/scripts/build-nargo.sh +RUN chmod +x /usr/src/noir/target/release/nargo FROM base as base-js RUN apt-get install -y ca-certificates curl gnupg From d09734ae1213c26eb2c297600b380111e2ae31ae Mon Sep 17 00:00:00 2001 From: Esau Date: Mon, 25 Dec 2023 16:12:15 +0100 Subject: [PATCH 153/182] Revert "asdf" This reverts commit 86d852ec48e490642d4dc7c8caa2a659d64210b8. --- .github/workflows/docker-test-flow.yml | 6 +++--- Dockerfile.ci | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 6c500aa906d..b6217cad1fc 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -157,9 +157,9 @@ jobs: with: name: nargo path: /usr/src/noir/target/release - # - name: prep downloaded artifact - # run: | - # chmod +x /usr/src/noir/target/release/nargo + - name: prep downloaded artifact + run: | + chmod +x /usr/src/noir/target/release/nargo - name: Download noir_wasm package artifact uses: actions/download-artifact@v4 with: diff --git a/Dockerfile.ci b/Dockerfile.ci index 03fc0d02f5a..ee26a71f392 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -6,7 +6,6 @@ ENV PATH="${PATH}:/usr/src/noir/target/release" FROM base as base-nargo COPY . . RUN .github/scripts/build-nargo.sh -RUN chmod +x /usr/src/noir/target/release/nargo FROM base as base-js RUN apt-get install -y ca-certificates curl gnupg From d697920cda9ad656ddc36aedca559a9e21f9d31e Mon Sep 17 00:00:00 2001 From: Esau Date: Mon, 25 Dec 2023 16:36:15 +0100 Subject: [PATCH 154/182] asdf --- .../actions/artifact-download-exec/action.yml | 21 +++++++++++++++++++ .github/workflows/docker-test-flow.yml | 9 ++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 .github/actions/artifact-download-exec/action.yml diff --git a/.github/actions/artifact-download-exec/action.yml b/.github/actions/artifact-download-exec/action.yml new file mode 100644 index 00000000000..33e2658afae --- /dev/null +++ b/.github/actions/artifact-download-exec/action.yml @@ -0,0 +1,21 @@ +name: Download executable artifact +description: Downloads executable artifact + +inputs: + name: + required: true + description: Name of executable AND artifact + path: + required: true + description: Path +runs: + using: composite + steps: + - name: download ${{ github.event.inputs.name }} + uses: actions/download-artifact@v4 + with: + name: ${{ github.event.inputs.name }} + path: ${{ github.event.inputs.path }} + - name: prep downloaded artifact + run: | + chmod +x ${{ github.event.inputs.path }}/${{ github.event.inputs.name }} \ No newline at end of file diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index b6217cad1fc..5bcd58de6c1 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -152,11 +152,16 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.github_token }} steps: - - name: download nargo - uses: actions/download-artifact@v4 + - name: Download nargo + uses: ./.github/actions/artifact-download-exec with: name: nargo path: /usr/src/noir/target/release + # - name: download nargo + # uses: actions/download-artifact@v4 + # with: + # name: nargo + # path: /usr/src/noir/target/release - name: prep downloaded artifact run: | chmod +x /usr/src/noir/target/release/nargo From ceb6f462eac7717a7a817ff78cc84f69352c3974 Mon Sep 17 00:00:00 2001 From: Esau Date: Mon, 25 Dec 2023 17:17:40 +0100 Subject: [PATCH 155/182] asdf --- .github/workflows/docker-test-flow.yml | 1009 ++++++++++++------------ 1 file changed, 512 insertions(+), 497 deletions(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 5bcd58de6c1..4f287bc1e9f 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -90,26 +90,8 @@ jobs: cache-to: type=gha,mode=max push: true - artifact-nargo: - name: artifact nargo - runs-on: ubuntu-latest - needs: [build-base-nargo] - container: - image: ghcr.io/noir-lang/noir:${{ github.sha }}-nargo - credentials: - username: ${{ github.actor }} - password: ${{ secrets.github_token }} - steps: - - name: artifact - uses: actions/upload-artifact@v4 - with: - name: nargo - path: /usr/src/noir/target/release/nargo - if-no-files-found: error - compression-level: 0 - - test-nargo: - name: test nargo + test-test: + name: test runs-on: ubuntu-latest needs: [build-base-nargo] container: @@ -119,585 +101,618 @@ jobs: password: ${{ secrets.github_token }} steps: - name: test - run: | - /usr/src/noir/.github/scripts/test-nargo.sh - - build-noir-wasm: - name: build noir wasm - runs-on: ubuntu-latest - needs: [build-base-js] - container: - image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - credentials: - username: ${{ github.actor }} - password: ${{ secrets.github_token }} - steps: - - name: build - run: | - /usr/src/noir/.github/scripts/noir-wasm-build.sh - - name: Upload artifact - uses: actions/upload-artifact@v4 - with: - name: noir_wasm - path: /usr/src/noir/compiler/wasm/outputs/out/noir_wasm - retention-days: 10 - - test-noir-wasm: - name: test noir wasm - runs-on: ubuntu-latest - needs: [build-base-js, artifact-nargo, build-noir-wasm] - container: - image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - credentials: - username: ${{ github.actor }} - password: ${{ secrets.github_token }} - steps: - - name: Download nargo - uses: ./.github/actions/artifact-download-exec - with: - name: nargo - path: /usr/src/noir/target/release - # - name: download nargo - # uses: actions/download-artifact@v4 - # with: - # name: nargo - # path: /usr/src/noir/target/release - - name: prep downloaded artifact - run: | - chmod +x /usr/src/noir/target/release/nargo - - name: Download noir_wasm package artifact - uses: actions/download-artifact@v4 - with: - name: noir_wasm - path: /usr/src/noir/compiler/wasm - - name: test - run: | - /usr/src/noir/.github/scripts/noir-wasm-test.sh - - test-noir-wasm-browser: - name: test noir wasm browser - runs-on: ubuntu-latest - needs: [build-base-js, artifact-nargo, build-noir-wasm] - container: - image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - credentials: - username: ${{ github.actor }} - password: ${{ secrets.github_token }} - steps: - - name: download nargo - uses: actions/download-artifact@v4 - with: - name: nargo - path: /usr/src/noir/target/release - - name: prep downloaded artifact - run: | - chmod +x /usr/src/noir/target/release/nargo - - name: Download noir_wasm package artifact - uses: actions/download-artifact@v4 - with: - name: noir_wasm - path: /usr/src/noir/compiler/wasm - - name: test - run: | - /usr/src/noir/.github/scripts/noir-wasm-test-browser.sh - - build-acvm_js: - name: build acvm js - runs-on: ubuntu-latest - needs: [build-base-js] - container: - image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - credentials: - username: ${{ github.actor }} - password: ${{ secrets.github_token }} - steps: - - name: build - run: | - /usr/src/noir/.github/scripts/acvm_js-build.sh - - name: artifact - uses: actions/upload-artifact@v4 - with: - name: acvm_js - path: - /usr/src/noir/acvm-repo/acvm_js/outputs/out/acvm_js - if-no-files-found: error - compression-level: 0 - - test-acvm_js: - name: test acvm js - runs-on: ubuntu-latest - needs: [build-base-js, build-acvm_js] - container: - image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - credentials: - username: ${{ github.actor }} - password: ${{ secrets.github_token }} - steps: - - name: download artifact - uses: actions/download-artifact@v4 - with: - name: acvm_js - path: | - /usr/src/noir/acvm-repo/acvm_js - - name: test - run: | - /usr/src/noir/.github/scripts/acvm_js-test.sh - - test-acvm_js-browser: - name: test acvm js browser - runs-on: ubuntu-latest - needs: [build-base-js, build-acvm_js] - container: - image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - credentials: - username: ${{ github.actor }} - password: ${{ secrets.github_token }} - steps: - - name: download artifact - uses: actions/download-artifact@v4 - with: - name: acvm_js - path: | - /usr/src/noir/acvm-repo/acvm_js - - name: test - run: | - /usr/src/noir/.github/scripts/acvm_js-test-browser.sh - - build-noirc-abi: - name: build noirc abi - runs-on: ubuntu-latest - needs: [build-base-js] - container: - image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - credentials: - username: ${{ github.actor }} - password: ${{ secrets.github_token }} - steps: - - name: build - run: | - /usr/src/noir/.github/scripts/noirc-abi-build.sh - - name: artifact - uses: actions/upload-artifact@v4 - with: - name: noirc_abi_wasm - path: - /usr/src/noir/tooling/noirc_abi_wasm/outputs/out/noirc_abi_wasm - if-no-files-found: error - compression-level: 0 - - test-noirc-abi: - name: test noirc abi - runs-on: ubuntu-latest - 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 artifact - uses: actions/download-artifact@v4 - with: - name: noirc_abi_wasm - path: | - /usr/src/noir/tooling/noirc_abi_wasm - - name: test - run: | - /usr/src/noir/.github/scripts/noirc-abi-test.sh - - test-noirc-abi-browser: - name: test noirc abi browser - runs-on: ubuntu-latest - 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 artifact - uses: actions/download-artifact@v4 - with: - name: noirc_abi_wasm - path: | - /usr/src/noir/tooling/noirc_abi_wasm + run: ls -la - name: test - run: | - /usr/src/noir/.github/scripts/noirc-abi-test-browser.sh - - build-noir-js-types: - name: build noir types - runs-on: ubuntu-latest - 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 artifact - uses: actions/download-artifact@v4 - with: - name: noirc_abi_wasm - path: | - /usr/src/noir/tooling/noirc_abi_wasm - - name: build - run: | - /usr/src/noir/.github/scripts/noir-js-types-build.sh - - name: artifact - uses: actions/upload-artifact@v4 - with: - name: noir-js-types - path: | - /usr/src/noir/tooling/noir_js_types/lib - if-no-files-found: error - compression-level: 0 + run: pwd - build-barretenberg-backend: - name: build barretenberg backend - runs-on: ubuntu-latest - needs: [build-base-js, build-noirc-abi, build-noir-js-types] - container: - image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - credentials: - username: ${{ github.actor }} - password: ${{ secrets.github_token }} - steps: - - name: download artifact - uses: actions/download-artifact@v4 - with: - name: noirc_abi_wasm - path: | - /usr/src/noir/tooling/noirc_abi_wasm - - name: download noir js types - uses: actions/download-artifact@v4 - with: - name: noir-js-types - path: /usr/src/noir/tooling/noir_js_types/lib/ - - name: build - run: | - /usr/src/noir/.github/scripts/backend-barretenberg-build.sh - - name: artifact - uses: actions/upload-artifact@v4 - with: - name: barretenberg-backend - path: - /usr/src/noir/tooling/noir_js_backend_barretenberg/lib - if-no-files-found: error - compression-level: 0 - - test-barretenberg-backend: - name: test barretenberg backend - runs-on: ubuntu-latest - needs: [build-base-js, build-noirc-abi, build-noir-js-types] - container: - image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - credentials: - username: ${{ github.actor }} - password: ${{ secrets.github_token }} - steps: - # - name: download artifact - # uses: actions/download-artifact@v4 - # with: - # name: noirc_abi_wasm - # path: | - # /usr/src/noir/tooling/noirc_abi_wasm - # - name: download noir js types - # uses: actions/download-artifact@v4 - # with: - # name: noir-js-types - # path: /usr/src/noir/tooling/noir_js_types/lib/ - - name: download backend barretenberg - uses: actions/download-artifact@v4 - with: - name: barretenberg-backend - path: - /usr/src/noir/tooling/noir_js_backend_barretenberg/lib - - name: test - run: | - /usr/src/noir/.github/scripts/backend-barretenberg-test.sh + # artifact-nargo: + # name: artifact nargo + # runs-on: ubuntu-latest + # needs: [build-base-nargo] + # container: + # image: ghcr.io/noir-lang/noir:${{ github.sha }}-nargo + # credentials: + # username: ${{ github.actor }} + # password: ${{ secrets.github_token }} + # steps: + # - name: artifact + # uses: actions/upload-artifact@v4 + # with: + # name: nargo + # path: /usr/src/noir/target/release/nargo + # if-no-files-found: error + # compression-level: 0 + + # test-nargo: + # name: test nargo + # runs-on: ubuntu-latest + # needs: [build-base-nargo] + # container: + # image: ghcr.io/noir-lang/noir:${{ github.sha }}-nargo + # credentials: + # username: ${{ github.actor }} + # password: ${{ secrets.github_token }} + # steps: + # - name: test + # run: | + # /usr/src/noir/.github/scripts/test-nargo.sh - # build-noir_js: - # name: build noirjs + # build-noir-wasm: + # name: build noir wasm # runs-on: ubuntu-latest - # needs: [build-base-js, build-noirc-abi, artifact-nargo, build-acvm_js, build-barretenberg-backend, build-noir-js-types] + # needs: [build-base-js] # container: # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js # credentials: # username: ${{ github.actor }} # password: ${{ secrets.github_token }} # steps: - # - name: download nargo - # uses: actions/download-artifact@v4 + # - name: build + # run: | + # /usr/src/noir/.github/scripts/noir-wasm-build.sh + # - name: Upload artifact + # uses: actions/upload-artifact@v4 + # with: + # name: noir_wasm + # path: /usr/src/noir/compiler/wasm/outputs/out/noir_wasm + # retention-days: 10 + + # test-noir-wasm: + # name: test noir wasm + # runs-on: ubuntu-latest + # needs: [build-base-js, artifact-nargo, build-noir-wasm] + # container: + # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + # credentials: + # username: ${{ github.actor }} + # password: ${{ secrets.github_token }} + # steps: + # - name: Download nargo + # uses: ./.github/actions/artifact-download-exec # with: # name: nargo # path: /usr/src/noir/target/release + # # - name: download nargo + # # uses: actions/download-artifact@v4 + # # with: + # # name: nargo + # # path: /usr/src/noir/target/release # - name: prep downloaded artifact # run: | # chmod +x /usr/src/noir/target/release/nargo - # - name: download artifact - # uses: actions/download-artifact@v4 - # with: - # name: noirc_abi_wasm - # path: | - # /usr/src/noir/tooling/noirc_abi_wasm - # - name: download artifact + # - name: Download noir_wasm package artifact # uses: actions/download-artifact@v4 # with: - # name: acvm_js - # path: | - # /usr/src/noir/acvm-repo/acvm_js - # - name: artifact + # name: noir_wasm + # path: /usr/src/noir/compiler/wasm + # - name: test + # run: | + # /usr/src/noir/.github/scripts/noir-wasm-test.sh + + # test-noir-wasm-browser: + # name: test noir wasm browser + # runs-on: ubuntu-latest + # needs: [build-base-js, artifact-nargo, build-noir-wasm] + # container: + # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + # credentials: + # username: ${{ github.actor }} + # password: ${{ secrets.github_token }} + # steps: + # - name: download nargo # uses: actions/download-artifact@v4 # with: - # name: barretenberg-backend - # path: - # /usr/src/noir/tooling/noir_js_backend_barretenberg/lib - # - name: artifact + # name: nargo + # path: /usr/src/noir/target/release + # - name: prep downloaded artifact + # run: | + # chmod +x /usr/src/noir/target/release/nargo + # - name: Download noir_wasm package artifact # uses: actions/download-artifact@v4 # with: - # name: noir-js-types - # path: | - # /usr/src/noir/tooling/noir_js_types/lib + # name: noir_wasm + # path: /usr/src/noir/compiler/wasm + # - name: test + # run: | + # /usr/src/noir/.github/scripts/noir-wasm-test-browser.sh + + # build-acvm_js: + # name: build acvm js + # runs-on: ubuntu-latest + # needs: [build-base-js] + # container: + # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + # credentials: + # username: ${{ github.actor }} + # password: ${{ secrets.github_token }} + # steps: # - name: build # run: | - # /usr/src/noir/.github/scripts/build-noir-js.sh + # /usr/src/noir/.github/scripts/acvm_js-build.sh # - name: artifact # uses: actions/upload-artifact@v4 # with: - # name: noir_js + # name: acvm_js # path: - # /usr/src/noir/tooling/noir_js/lib + # /usr/src/noir/acvm-repo/acvm_js/outputs/out/acvm_js + # if-no-files-found: error + # compression-level: 0 - # test-noir_js: - # name: test noirjs + # test-acvm_js: + # name: test acvm js # runs-on: ubuntu-latest - # needs: [ - # build-base-js, - # build-noirc-abi, - # artifact-nargo, - # build-acvm_js, - # build-barretenberg-backend, - # build-noir_js - # ] + # needs: [build-base-js, build-acvm_js] # container: # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js # credentials: # username: ${{ github.actor }} # password: ${{ secrets.github_token }} # steps: - # - name: download nargo - # uses: actions/download-artifact@v4 - # with: - # name: nargo - # path: /usr/src/noir/target/release - # - name: prep downloaded artifact - # run: | - # chmod +x /usr/src/noir/target/release/nargo # - name: download artifact # uses: actions/download-artifact@v4 # with: - # name: noirc_abi_wasm + # name: acvm_js # path: | - # /usr/src/noir/tooling/noirc_abi_wasm + # /usr/src/noir/acvm-repo/acvm_js + # - name: test + # run: | + # /usr/src/noir/.github/scripts/acvm_js-test.sh + + # test-acvm_js-browser: + # name: test acvm js browser + # runs-on: ubuntu-latest + # needs: [build-base-js, build-acvm_js] + # container: + # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + # credentials: + # username: ${{ github.actor }} + # password: ${{ secrets.github_token }} + # steps: # - name: download artifact # uses: actions/download-artifact@v4 # with: # name: acvm_js # path: | # /usr/src/noir/acvm-repo/acvm_js + # - name: test + # run: | + # /usr/src/noir/.github/scripts/acvm_js-test-browser.sh + + # build-noirc-abi: + # name: build noirc abi + # runs-on: ubuntu-latest + # needs: [build-base-js] + # container: + # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + # credentials: + # username: ${{ github.actor }} + # password: ${{ secrets.github_token }} + # steps: + # - name: build + # run: | + # /usr/src/noir/.github/scripts/noirc-abi-build.sh # - name: artifact - # uses: actions/download-artifact@v4 + # uses: actions/upload-artifact@v4 # with: - # name: barretenberg-backend + # name: noirc_abi_wasm # path: - # /usr/src/noir/tooling/noir_js_backend_barretenberg/lib - # - name: artifact + # /usr/src/noir/tooling/noirc_abi_wasm/outputs/out/noirc_abi_wasm + # if-no-files-found: error + # compression-level: 0 + + # test-noirc-abi: + # name: test noirc abi + # runs-on: ubuntu-latest + # 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 artifact # uses: actions/download-artifact@v4 # with: - # name: noir-js-types + # name: noirc_abi_wasm # path: | - # /usr/src/noir/tooling/noir_js_types/lib - # - name: artifact - # uses: actions/upload-artifact@v4 - # with: - # name: noir_js - # path: - # /usr/src/noir/tooling/noir_js/lib + # /usr/src/noir/tooling/noirc_abi_wasm # - name: test # run: | - # /usr/src/noir/.github/scripts/noir-js-test.sh + # /usr/src/noir/.github/scripts/noirc-abi-test.sh - # build-noir_codegen: - # name: build noir codegen + # test-noirc-abi-browser: + # name: test noirc abi browser # runs-on: ubuntu-latest - # needs: [build-base-js, artifact-nargo, test-noirc-abi, test-acvm_js, build-noir-js-types, test-noir_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 nargo + # - name: download artifact # uses: actions/download-artifact@v4 # with: - # name: nargo - # path: /usr/src/noir/target/release - # - name: prep downloaded artifact + # name: noirc_abi_wasm + # path: | + # /usr/src/noir/tooling/noirc_abi_wasm + # - name: test # run: | - # chmod +x /usr/src/noir/target/release/nargo - # - name: Download noirc_abi package artifact + # /usr/src/noir/.github/scripts/noirc-abi-test-browser.sh + + # build-noir-js-types: + # name: build noir types + # runs-on: ubuntu-latest + # 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 artifact # uses: actions/download-artifact@v4 # with: # name: noirc_abi_wasm - # path: /usr/src/noir/tooling/noirc_abi_wasm - # - name: Download acvm_js package artifact - # uses: actions/download-artifact@v4 - # with: - # name: acvm_js - # path: /usr/src/noir/acvm-repo/acvm_js - # - name: artifact - # uses: actions/download-artifact@v4 - # with: - # name: noir-js-types # path: | - # /usr/src/noir/tooling/noir_js_types/lib - # - name: artifact - # uses: actions/download-artifact@v4 - # with: - # name: noir_js - # path: - # /usr/src/noir/tooling/noir_js/lib + # /usr/src/noir/tooling/noirc_abi_wasm # - name: build # run: | - # /usr/src/noir/.github/scripts/noir-codegen-build.sh + # /usr/src/noir/.github/scripts/noir-js-types-build.sh # - name: artifact # uses: actions/upload-artifact@v4 # with: - # name: noir_codegen - # path: - # /usr/src/noir/tooling/noir_codegen/lib - - # test-noir_codegen: - # name: test noir codegen + # name: noir-js-types + # path: | + # /usr/src/noir/tooling/noir_js_types/lib + # if-no-files-found: error + # compression-level: 0 + + # build-barretenberg-backend: + # name: build barretenberg backend # runs-on: ubuntu-latest - # needs: [build-base-js, artifact-nargo, test-noirc-abi, test-acvm_js, build-noir-js-types, test-noir_js] + # needs: [build-base-js, build-noirc-abi, build-noir-js-types] # container: # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js # credentials: # username: ${{ github.actor }} # password: ${{ secrets.github_token }} # steps: - # - name: download nargo - # uses: actions/download-artifact@v4 - # with: - # name: nargo - # path: /usr/src/noir/target/release - # - name: prep downloaded artifact - # run: | - # chmod +x /usr/src/noir/target/release/nargo - # - name: Download noirc_abi package artifact + # - name: download artifact # uses: actions/download-artifact@v4 # with: # name: noirc_abi_wasm - # path: /usr/src/noir/tooling/noirc_abi_wasm - # - name: Download acvm_js package artifact - # uses: actions/download-artifact@v4 - # with: - # name: acvm_js - # path: /usr/src/noir/acvm-repo/acvm_js - # - name: artifact - # uses: actions/download-artifact@v4 - # with: - # name: noir-js-types # path: | - # /usr/src/noir/tooling/noir_js_types/lib - # - name: artifact + # /usr/src/noir/tooling/noirc_abi_wasm + # - name: download noir js types # uses: actions/download-artifact@v4 # with: - # name: noir_js - # path: - # /usr/src/noir/tooling/noir_js/lib + # name: noir-js-types + # path: /usr/src/noir/tooling/noir_js_types/lib/ + # - name: build + # run: | + # /usr/src/noir/.github/scripts/backend-barretenberg-build.sh # - name: artifact - # uses: actions/download-artifact@v4 + # uses: actions/upload-artifact@v4 # with: - # name: noir_codegen + # name: barretenberg-backend # path: - # /usr/src/noir/tooling/noir_codegen/lib - # - name: test - # run: | - # /usr/src/noir/.github/scripts/noir-codegen-test.sh + # /usr/src/noir/tooling/noir_js_backend_barretenberg/lib + # if-no-files-found: error + # compression-level: 0 - # test-integration: - # name: integration test + # test-barretenberg-backend: + # name: test barretenberg backend # runs-on: ubuntu-latest - # needs: [build-base-js, artifact-nargo, test-noir-wasm, test-noirc-abi, test-acvm_js, build-noir-js-types, test-noir_js] + # needs: [build-base-js, build-noirc-abi, build-noir-js-types] # container: # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js # credentials: # username: ${{ github.actor }} # password: ${{ secrets.github_token }} # steps: - # - name: download nargo - # uses: actions/download-artifact@v4 - # with: - # name: nargo - # path: /usr/src/noir/target/release - # - name: prep downloaded artifact - # run: | - # chmod +x /usr/src/noir/target/release/nargo - # - name: Upload artifact - # uses: actions/download-artifact@v4 - # with: - # name: noir_wasm - # path: /usr/src/noir/compiler/wasm/outputs/out/noir_wasm - # - name: Download noirc_abi package artifact - # uses: actions/download-artifact@v4 - # with: - # name: noirc_abi_wasm - # path: /usr/src/noir/tooling/noirc_abi_wasm - # - name: Download acvm_js package artifact + # # - name: download artifact + # # uses: actions/download-artifact@v4 + # # with: + # # name: noirc_abi_wasm + # # path: | + # # /usr/src/noir/tooling/noirc_abi_wasm + # # - name: download noir js types + # # uses: actions/download-artifact@v4 + # # with: + # # name: noir-js-types + # # path: /usr/src/noir/tooling/noir_js_types/lib/ + # - name: download backend barretenberg # uses: actions/download-artifact@v4 # with: - # name: acvm_js - # path: /usr/src/noir/acvm-repo/acvm_js - # - name: Download noir js types - # uses: actions/download-artifact@v4 - # with: - # name: noir-js-types - # path: | - # /usr/src/noir/tooling/noir_js_types/lib - # - name: Download noir js - # uses: actions/download-artifact@v4 - # with: - # name: noir_js + # name: barretenberg-backend # path: - # /usr/src/noir/tooling/noir_js/lib + # /usr/src/noir/tooling/noir_js_backend_barretenberg/lib # - name: test # run: | - # /usr/src/noir/.github/scripts/test-noir-codegen.sh + # /usr/src/noir/.github/scripts/backend-barretenberg-test.sh - # tests-end: - # name: End - # runs-on: ubuntu-latest - # if: ${{ always() }} - # needs: - # - test-nargo - # - test-noirc-abi - # - test-noir-wasm - # - test-integration - # - test-noir_codegen - # - test-acvm_js - # - test-barretenberg-backend - # - test-noir_js + # # build-noir_js: + # # name: build noirjs + # # runs-on: ubuntu-latest + # # needs: [build-base-js, build-noirc-abi, artifact-nargo, build-acvm_js, build-barretenberg-backend, build-noir-js-types] + # # container: + # # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + # # credentials: + # # username: ${{ github.actor }} + # # password: ${{ secrets.github_token }} + # # steps: + # # - name: download nargo + # # uses: actions/download-artifact@v4 + # # with: + # # name: nargo + # # path: /usr/src/noir/target/release + # # - name: prep downloaded artifact + # # run: | + # # chmod +x /usr/src/noir/target/release/nargo + # # - name: download artifact + # # uses: actions/download-artifact@v4 + # # with: + # # name: noirc_abi_wasm + # # path: | + # # /usr/src/noir/tooling/noirc_abi_wasm + # # - name: download artifact + # # uses: actions/download-artifact@v4 + # # with: + # # name: acvm_js + # # path: | + # # /usr/src/noir/acvm-repo/acvm_js + # # - name: artifact + # # uses: actions/download-artifact@v4 + # # with: + # # name: barretenberg-backend + # # path: + # # /usr/src/noir/tooling/noir_js_backend_barretenberg/lib + # # - name: artifact + # # uses: actions/download-artifact@v4 + # # with: + # # name: noir-js-types + # # path: | + # # /usr/src/noir/tooling/noir_js_types/lib + # # - name: build + # # run: | + # # /usr/src/noir/.github/scripts/build-noir-js.sh + # # - name: artifact + # # uses: actions/upload-artifact@v4 + # # with: + # # name: noir_js + # # path: + # # /usr/src/noir/tooling/noir_js/lib + + # # test-noir_js: + # # name: test noirjs + # # runs-on: ubuntu-latest + # # needs: [ + # # build-base-js, + # # build-noirc-abi, + # # artifact-nargo, + # # build-acvm_js, + # # build-barretenberg-backend, + # # build-noir_js + # # ] + # # container: + # # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + # # credentials: + # # username: ${{ github.actor }} + # # password: ${{ secrets.github_token }} + # # steps: + # # - name: download nargo + # # uses: actions/download-artifact@v4 + # # with: + # # name: nargo + # # path: /usr/src/noir/target/release + # # - name: prep downloaded artifact + # # run: | + # # chmod +x /usr/src/noir/target/release/nargo + # # - name: download artifact + # # uses: actions/download-artifact@v4 + # # with: + # # name: noirc_abi_wasm + # # path: | + # # /usr/src/noir/tooling/noirc_abi_wasm + # # - name: download artifact + # # uses: actions/download-artifact@v4 + # # with: + # # name: acvm_js + # # path: | + # # /usr/src/noir/acvm-repo/acvm_js + # # - name: artifact + # # uses: actions/download-artifact@v4 + # # with: + # # name: barretenberg-backend + # # path: + # # /usr/src/noir/tooling/noir_js_backend_barretenberg/lib + # # - name: artifact + # # uses: actions/download-artifact@v4 + # # with: + # # name: noir-js-types + # # path: | + # # /usr/src/noir/tooling/noir_js_types/lib + # # - name: artifact + # # uses: actions/upload-artifact@v4 + # # with: + # # name: noir_js + # # path: + # # /usr/src/noir/tooling/noir_js/lib + # # - name: test + # # run: | + # # /usr/src/noir/.github/scripts/noir-js-test.sh + + # # build-noir_codegen: + # # name: build noir codegen + # # runs-on: ubuntu-latest + # # needs: [build-base-js, artifact-nargo, test-noirc-abi, test-acvm_js, build-noir-js-types, test-noir_js] + # # container: + # # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + # # credentials: + # # username: ${{ github.actor }} + # # password: ${{ secrets.github_token }} + # # steps: + # # - name: download nargo + # # uses: actions/download-artifact@v4 + # # with: + # # name: nargo + # # path: /usr/src/noir/target/release + # # - name: prep downloaded artifact + # # run: | + # # chmod +x /usr/src/noir/target/release/nargo + # # - name: Download noirc_abi package artifact + # # uses: actions/download-artifact@v4 + # # with: + # # name: noirc_abi_wasm + # # path: /usr/src/noir/tooling/noirc_abi_wasm + # # - name: Download acvm_js package artifact + # # uses: actions/download-artifact@v4 + # # with: + # # name: acvm_js + # # path: /usr/src/noir/acvm-repo/acvm_js + # # - name: artifact + # # uses: actions/download-artifact@v4 + # # with: + # # name: noir-js-types + # # path: | + # # /usr/src/noir/tooling/noir_js_types/lib + # # - name: artifact + # # uses: actions/download-artifact@v4 + # # with: + # # name: noir_js + # # path: + # # /usr/src/noir/tooling/noir_js/lib + # # - name: build + # # run: | + # # /usr/src/noir/.github/scripts/noir-codegen-build.sh + # # - name: artifact + # # uses: actions/upload-artifact@v4 + # # with: + # # name: noir_codegen + # # path: + # # /usr/src/noir/tooling/noir_codegen/lib + + # # test-noir_codegen: + # # name: test noir codegen + # # runs-on: ubuntu-latest + # # needs: [build-base-js, artifact-nargo, test-noirc-abi, test-acvm_js, build-noir-js-types, test-noir_js] + # # container: + # # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + # # credentials: + # # username: ${{ github.actor }} + # # password: ${{ secrets.github_token }} + # # steps: + # # - name: download nargo + # # uses: actions/download-artifact@v4 + # # with: + # # name: nargo + # # path: /usr/src/noir/target/release + # # - name: prep downloaded artifact + # # run: | + # # chmod +x /usr/src/noir/target/release/nargo + # # - name: Download noirc_abi package artifact + # # uses: actions/download-artifact@v4 + # # with: + # # name: noirc_abi_wasm + # # path: /usr/src/noir/tooling/noirc_abi_wasm + # # - name: Download acvm_js package artifact + # # uses: actions/download-artifact@v4 + # # with: + # # name: acvm_js + # # path: /usr/src/noir/acvm-repo/acvm_js + # # - name: artifact + # # uses: actions/download-artifact@v4 + # # with: + # # name: noir-js-types + # # path: | + # # /usr/src/noir/tooling/noir_js_types/lib + # # - name: artifact + # # uses: actions/download-artifact@v4 + # # with: + # # name: noir_js + # # path: + # # /usr/src/noir/tooling/noir_js/lib + # # - name: artifact + # # uses: actions/download-artifact@v4 + # # with: + # # name: noir_codegen + # # path: + # # /usr/src/noir/tooling/noir_codegen/lib + # # - name: test + # # run: | + # # /usr/src/noir/.github/scripts/noir-codegen-test.sh + + # # test-integration: + # # name: integration test + # # runs-on: ubuntu-latest + # # needs: [build-base-js, artifact-nargo, test-noir-wasm, test-noirc-abi, test-acvm_js, build-noir-js-types, test-noir_js] + # # container: + # # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + # # credentials: + # # username: ${{ github.actor }} + # # password: ${{ secrets.github_token }} + # # steps: + # # - name: download nargo + # # uses: actions/download-artifact@v4 + # # with: + # # name: nargo + # # path: /usr/src/noir/target/release + # # - name: prep downloaded artifact + # # run: | + # # chmod +x /usr/src/noir/target/release/nargo + # # - name: Upload artifact + # # uses: actions/download-artifact@v4 + # # with: + # # name: noir_wasm + # # path: /usr/src/noir/compiler/wasm/outputs/out/noir_wasm + # # - name: Download noirc_abi package artifact + # # uses: actions/download-artifact@v4 + # # with: + # # name: noirc_abi_wasm + # # path: /usr/src/noir/tooling/noirc_abi_wasm + # # - name: Download acvm_js package artifact + # # uses: actions/download-artifact@v4 + # # with: + # # name: acvm_js + # # path: /usr/src/noir/acvm-repo/acvm_js + # # - name: Download noir js types + # # uses: actions/download-artifact@v4 + # # with: + # # name: noir-js-types + # # path: | + # # /usr/src/noir/tooling/noir_js_types/lib + # # - name: Download noir js + # # uses: actions/download-artifact@v4 + # # with: + # # name: noir_js + # # path: + # # /usr/src/noir/tooling/noir_js/lib + # # - name: test + # # run: | + # # /usr/src/noir/.github/scripts/test-noir-codegen.sh + + # # tests-end: + # # name: End + # # runs-on: ubuntu-latest + # # if: ${{ always() }} + # # needs: + # # - test-nargo + # # - test-noirc-abi + # # - test-noir-wasm + # # - test-integration + # # - test-noir_codegen + # # - test-acvm_js + # # - test-barretenberg-backend + # # - test-noir_js - # steps: - # - name: Report overall success - # run: | - # if [[ $FAIL == true ]]; then - # exit 1 - # else - # exit 0 - # fi - # env: - # FAIL: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'skipped') }} + # # steps: + # # - name: Report overall success + # # run: | + # # if [[ $FAIL == true ]]; then + # # exit 1 + # # else + # # exit 0 + # # fi + # # env: + # # FAIL: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'skipped') }} From 6bbbbfb1c5142e73169dfe823295cd54377f92ca Mon Sep 17 00:00:00 2001 From: Esau Date: Mon, 25 Dec 2023 17:20:37 +0100 Subject: [PATCH 156/182] asdf --- .github/actions/artifact-download-exec/action.yml | 1 + .github/workflows/docker-test-flow.yml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/actions/artifact-download-exec/action.yml b/.github/actions/artifact-download-exec/action.yml index 33e2658afae..9eba202dcea 100644 --- a/.github/actions/artifact-download-exec/action.yml +++ b/.github/actions/artifact-download-exec/action.yml @@ -17,5 +17,6 @@ runs: name: ${{ github.event.inputs.name }} path: ${{ github.event.inputs.path }} - name: prep downloaded artifact + shell: bash run: | chmod +x ${{ github.event.inputs.path }}/${{ github.event.inputs.name }} \ No newline at end of file diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 4f287bc1e9f..7d97f0ddc78 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -93,9 +93,9 @@ jobs: test-test: name: test runs-on: ubuntu-latest - needs: [build-base-nargo] + needs: [build-base-js] container: - image: ghcr.io/noir-lang/noir:${{ github.sha }}-nargo + image: ghcr.io/noir-lang/noir:${{ github.sha }}-js credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} From eb2c1d683f8162db1c16f28fd3d553c16ef67734 Mon Sep 17 00:00:00 2001 From: Esau Date: Mon, 25 Dec 2023 17:30:58 +0100 Subject: [PATCH 157/182] sadfas asdf --- .github/workflows/docker-test-flow.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 7d97f0ddc78..6be4bb6c9c7 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -99,6 +99,7 @@ jobs: credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} + options: -w /usr/src/noir steps: - name: test run: ls -la From 558aecf2c1ed1ede57edda36e467aea2c0c64312 Mon Sep 17 00:00:00 2001 From: Esau Date: Mon, 25 Dec 2023 17:44:30 +0100 Subject: [PATCH 158/182] asdf --- .github/workflows/docker-test-flow.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 6be4bb6c9c7..3ac421d49fa 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -99,12 +99,17 @@ jobs: credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} - options: -w /usr/src/noir + options: --workdir /usr/src/noir steps: - name: test run: ls -la - name: test run: pwd + - name: test + run: cd /usr/src/noir + - name: test + run: pwd + working-directory: /usr/src/noir # artifact-nargo: # name: artifact nargo From b8d08190675ca7f3232df7532f370f0212be8987 Mon Sep 17 00:00:00 2001 From: Esau Date: Mon, 25 Dec 2023 17:59:29 +0100 Subject: [PATCH 159/182] Revert "asdf" This reverts commit d697920cda9ad656ddc36aedca559a9e21f9d31e. --- .../actions/artifact-download-exec/action.yml | 22 - .github/workflows/docker-test-flow.yml | 1006 ++++++++--------- 2 files changed, 490 insertions(+), 538 deletions(-) delete mode 100644 .github/actions/artifact-download-exec/action.yml diff --git a/.github/actions/artifact-download-exec/action.yml b/.github/actions/artifact-download-exec/action.yml deleted file mode 100644 index 9eba202dcea..00000000000 --- a/.github/actions/artifact-download-exec/action.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Download executable artifact -description: Downloads executable artifact - -inputs: - name: - required: true - description: Name of executable AND artifact - path: - required: true - description: Path -runs: - using: composite - steps: - - name: download ${{ github.event.inputs.name }} - uses: actions/download-artifact@v4 - with: - name: ${{ github.event.inputs.name }} - path: ${{ github.event.inputs.path }} - - name: prep downloaded artifact - shell: bash - run: | - chmod +x ${{ github.event.inputs.path }}/${{ github.event.inputs.name }} \ No newline at end of file diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 3ac421d49fa..b6217cad1fc 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -90,8 +90,40 @@ jobs: cache-to: type=gha,mode=max push: true - test-test: - name: test + artifact-nargo: + name: artifact nargo + runs-on: ubuntu-latest + needs: [build-base-nargo] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }}-nargo + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: artifact + uses: actions/upload-artifact@v4 + with: + name: nargo + path: /usr/src/noir/target/release/nargo + if-no-files-found: error + compression-level: 0 + + test-nargo: + name: test nargo + runs-on: ubuntu-latest + needs: [build-base-nargo] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }}-nargo + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: test + run: | + /usr/src/noir/.github/scripts/test-nargo.sh + + build-noir-wasm: + name: build noir wasm runs-on: ubuntu-latest needs: [build-base-js] container: @@ -99,626 +131,568 @@ jobs: credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} - options: --workdir /usr/src/noir steps: + - name: build + run: | + /usr/src/noir/.github/scripts/noir-wasm-build.sh + - name: Upload artifact + uses: actions/upload-artifact@v4 + with: + name: noir_wasm + path: /usr/src/noir/compiler/wasm/outputs/out/noir_wasm + retention-days: 10 + + test-noir-wasm: + name: test noir wasm + runs-on: ubuntu-latest + needs: [build-base-js, artifact-nargo, build-noir-wasm] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: download nargo + uses: actions/download-artifact@v4 + with: + name: nargo + path: /usr/src/noir/target/release + - name: prep downloaded artifact + run: | + chmod +x /usr/src/noir/target/release/nargo + - name: Download noir_wasm package artifact + uses: actions/download-artifact@v4 + with: + name: noir_wasm + path: /usr/src/noir/compiler/wasm - name: test - run: ls -la + run: | + /usr/src/noir/.github/scripts/noir-wasm-test.sh + + test-noir-wasm-browser: + name: test noir wasm browser + runs-on: ubuntu-latest + needs: [build-base-js, artifact-nargo, build-noir-wasm] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: download nargo + uses: actions/download-artifact@v4 + with: + name: nargo + path: /usr/src/noir/target/release + - name: prep downloaded artifact + run: | + chmod +x /usr/src/noir/target/release/nargo + - name: Download noir_wasm package artifact + uses: actions/download-artifact@v4 + with: + name: noir_wasm + path: /usr/src/noir/compiler/wasm - name: test - run: pwd + run: | + /usr/src/noir/.github/scripts/noir-wasm-test-browser.sh + + build-acvm_js: + name: build acvm js + runs-on: ubuntu-latest + needs: [build-base-js] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: build + run: | + /usr/src/noir/.github/scripts/acvm_js-build.sh + - name: artifact + uses: actions/upload-artifact@v4 + with: + name: acvm_js + path: + /usr/src/noir/acvm-repo/acvm_js/outputs/out/acvm_js + if-no-files-found: error + compression-level: 0 + + test-acvm_js: + name: test acvm js + runs-on: ubuntu-latest + needs: [build-base-js, build-acvm_js] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: download artifact + uses: actions/download-artifact@v4 + with: + name: acvm_js + path: | + /usr/src/noir/acvm-repo/acvm_js - name: test - run: cd /usr/src/noir + run: | + /usr/src/noir/.github/scripts/acvm_js-test.sh + + test-acvm_js-browser: + name: test acvm js browser + runs-on: ubuntu-latest + needs: [build-base-js, build-acvm_js] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: download artifact + uses: actions/download-artifact@v4 + with: + name: acvm_js + path: | + /usr/src/noir/acvm-repo/acvm_js - name: test - run: pwd - working-directory: /usr/src/noir + run: | + /usr/src/noir/.github/scripts/acvm_js-test-browser.sh - # artifact-nargo: - # name: artifact nargo - # runs-on: ubuntu-latest - # needs: [build-base-nargo] - # container: - # image: ghcr.io/noir-lang/noir:${{ github.sha }}-nargo - # credentials: - # username: ${{ github.actor }} - # password: ${{ secrets.github_token }} - # steps: - # - name: artifact - # uses: actions/upload-artifact@v4 - # with: - # name: nargo - # path: /usr/src/noir/target/release/nargo - # if-no-files-found: error - # compression-level: 0 - - # test-nargo: - # name: test nargo - # runs-on: ubuntu-latest - # needs: [build-base-nargo] - # container: - # image: ghcr.io/noir-lang/noir:${{ github.sha }}-nargo - # credentials: - # username: ${{ github.actor }} - # password: ${{ secrets.github_token }} - # steps: - # - name: test - # run: | - # /usr/src/noir/.github/scripts/test-nargo.sh + build-noirc-abi: + name: build noirc abi + runs-on: ubuntu-latest + needs: [build-base-js] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: build + run: | + /usr/src/noir/.github/scripts/noirc-abi-build.sh + - name: artifact + uses: actions/upload-artifact@v4 + with: + name: noirc_abi_wasm + path: + /usr/src/noir/tooling/noirc_abi_wasm/outputs/out/noirc_abi_wasm + if-no-files-found: error + compression-level: 0 - # build-noir-wasm: - # name: build noir wasm - # runs-on: ubuntu-latest - # needs: [build-base-js] - # container: - # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - # credentials: - # username: ${{ github.actor }} - # password: ${{ secrets.github_token }} - # steps: - # - name: build - # run: | - # /usr/src/noir/.github/scripts/noir-wasm-build.sh - # - name: Upload artifact - # uses: actions/upload-artifact@v4 - # with: - # name: noir_wasm - # path: /usr/src/noir/compiler/wasm/outputs/out/noir_wasm - # retention-days: 10 - - # test-noir-wasm: - # name: test noir wasm + test-noirc-abi: + name: test noirc abi + runs-on: ubuntu-latest + 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 artifact + uses: actions/download-artifact@v4 + with: + name: noirc_abi_wasm + path: | + /usr/src/noir/tooling/noirc_abi_wasm + - name: test + run: | + /usr/src/noir/.github/scripts/noirc-abi-test.sh + + test-noirc-abi-browser: + name: test noirc abi browser + runs-on: ubuntu-latest + 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 artifact + uses: actions/download-artifact@v4 + with: + name: noirc_abi_wasm + path: | + /usr/src/noir/tooling/noirc_abi_wasm + - name: test + run: | + /usr/src/noir/.github/scripts/noirc-abi-test-browser.sh + + build-noir-js-types: + name: build noir types + runs-on: ubuntu-latest + 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 artifact + uses: actions/download-artifact@v4 + with: + name: noirc_abi_wasm + path: | + /usr/src/noir/tooling/noirc_abi_wasm + - name: build + run: | + /usr/src/noir/.github/scripts/noir-js-types-build.sh + - name: artifact + uses: actions/upload-artifact@v4 + with: + name: noir-js-types + path: | + /usr/src/noir/tooling/noir_js_types/lib + if-no-files-found: error + compression-level: 0 + + build-barretenberg-backend: + name: build barretenberg backend + runs-on: ubuntu-latest + needs: [build-base-js, build-noirc-abi, build-noir-js-types] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: download artifact + uses: actions/download-artifact@v4 + with: + name: noirc_abi_wasm + path: | + /usr/src/noir/tooling/noirc_abi_wasm + - name: download noir js types + uses: actions/download-artifact@v4 + with: + name: noir-js-types + path: /usr/src/noir/tooling/noir_js_types/lib/ + - name: build + run: | + /usr/src/noir/.github/scripts/backend-barretenberg-build.sh + - name: artifact + uses: actions/upload-artifact@v4 + with: + name: barretenberg-backend + path: + /usr/src/noir/tooling/noir_js_backend_barretenberg/lib + if-no-files-found: error + compression-level: 0 + + test-barretenberg-backend: + name: test barretenberg backend + runs-on: ubuntu-latest + needs: [build-base-js, build-noirc-abi, build-noir-js-types] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + # - name: download artifact + # uses: actions/download-artifact@v4 + # with: + # name: noirc_abi_wasm + # path: | + # /usr/src/noir/tooling/noirc_abi_wasm + # - name: download noir js types + # uses: actions/download-artifact@v4 + # with: + # name: noir-js-types + # path: /usr/src/noir/tooling/noir_js_types/lib/ + - name: download backend barretenberg + uses: actions/download-artifact@v4 + with: + name: barretenberg-backend + path: + /usr/src/noir/tooling/noir_js_backend_barretenberg/lib + - name: test + run: | + /usr/src/noir/.github/scripts/backend-barretenberg-test.sh + + # build-noir_js: + # name: build noirjs # runs-on: ubuntu-latest - # needs: [build-base-js, artifact-nargo, build-noir-wasm] + # needs: [build-base-js, build-noirc-abi, artifact-nargo, build-acvm_js, build-barretenberg-backend, build-noir-js-types] # container: # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js # credentials: # username: ${{ github.actor }} # password: ${{ secrets.github_token }} # steps: - # - name: Download nargo - # uses: ./.github/actions/artifact-download-exec + # - name: download nargo + # uses: actions/download-artifact@v4 # with: # name: nargo # path: /usr/src/noir/target/release - # # - name: download nargo - # # uses: actions/download-artifact@v4 - # # with: - # # name: nargo - # # path: /usr/src/noir/target/release # - name: prep downloaded artifact # run: | # chmod +x /usr/src/noir/target/release/nargo - # - name: Download noir_wasm package artifact + # - name: download artifact # uses: actions/download-artifact@v4 # with: - # name: noir_wasm - # path: /usr/src/noir/compiler/wasm - # - name: test - # run: | - # /usr/src/noir/.github/scripts/noir-wasm-test.sh - - # test-noir-wasm-browser: - # name: test noir wasm browser - # runs-on: ubuntu-latest - # needs: [build-base-js, artifact-nargo, build-noir-wasm] - # container: - # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - # credentials: - # username: ${{ github.actor }} - # password: ${{ secrets.github_token }} - # steps: - # - name: download nargo + # name: noirc_abi_wasm + # path: | + # /usr/src/noir/tooling/noirc_abi_wasm + # - name: download artifact # uses: actions/download-artifact@v4 # with: - # name: nargo - # path: /usr/src/noir/target/release - # - name: prep downloaded artifact - # run: | - # chmod +x /usr/src/noir/target/release/nargo - # - name: Download noir_wasm package artifact + # name: acvm_js + # path: | + # /usr/src/noir/acvm-repo/acvm_js + # - name: artifact # uses: actions/download-artifact@v4 # with: - # name: noir_wasm - # path: /usr/src/noir/compiler/wasm - # - name: test - # run: | - # /usr/src/noir/.github/scripts/noir-wasm-test-browser.sh - - # build-acvm_js: - # name: build acvm js - # runs-on: ubuntu-latest - # needs: [build-base-js] - # container: - # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - # credentials: - # username: ${{ github.actor }} - # password: ${{ secrets.github_token }} - # steps: + # name: barretenberg-backend + # path: + # /usr/src/noir/tooling/noir_js_backend_barretenberg/lib + # - name: artifact + # uses: actions/download-artifact@v4 + # with: + # name: noir-js-types + # path: | + # /usr/src/noir/tooling/noir_js_types/lib # - name: build # run: | - # /usr/src/noir/.github/scripts/acvm_js-build.sh + # /usr/src/noir/.github/scripts/build-noir-js.sh # - name: artifact # uses: actions/upload-artifact@v4 # with: - # name: acvm_js + # name: noir_js # path: - # /usr/src/noir/acvm-repo/acvm_js/outputs/out/acvm_js - # if-no-files-found: error - # compression-level: 0 + # /usr/src/noir/tooling/noir_js/lib - # test-acvm_js: - # name: test acvm js + # test-noir_js: + # name: test noirjs # runs-on: ubuntu-latest - # needs: [build-base-js, build-acvm_js] + # needs: [ + # build-base-js, + # build-noirc-abi, + # artifact-nargo, + # build-acvm_js, + # build-barretenberg-backend, + # build-noir_js + # ] # container: # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js # credentials: # username: ${{ github.actor }} # password: ${{ secrets.github_token }} # steps: + # - name: download nargo + # uses: actions/download-artifact@v4 + # with: + # name: nargo + # path: /usr/src/noir/target/release + # - name: prep downloaded artifact + # run: | + # chmod +x /usr/src/noir/target/release/nargo # - name: download artifact # uses: actions/download-artifact@v4 # with: - # name: acvm_js + # name: noirc_abi_wasm # path: | - # /usr/src/noir/acvm-repo/acvm_js - # - name: test - # run: | - # /usr/src/noir/.github/scripts/acvm_js-test.sh - - # test-acvm_js-browser: - # name: test acvm js browser - # runs-on: ubuntu-latest - # needs: [build-base-js, build-acvm_js] - # container: - # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - # credentials: - # username: ${{ github.actor }} - # password: ${{ secrets.github_token }} - # steps: + # /usr/src/noir/tooling/noirc_abi_wasm # - name: download artifact # uses: actions/download-artifact@v4 # with: # name: acvm_js # path: | # /usr/src/noir/acvm-repo/acvm_js - # - name: test - # run: | - # /usr/src/noir/.github/scripts/acvm_js-test-browser.sh - - # build-noirc-abi: - # name: build noirc abi - # runs-on: ubuntu-latest - # needs: [build-base-js] - # container: - # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - # credentials: - # username: ${{ github.actor }} - # password: ${{ secrets.github_token }} - # steps: - # - name: build - # run: | - # /usr/src/noir/.github/scripts/noirc-abi-build.sh # - name: artifact - # uses: actions/upload-artifact@v4 + # uses: actions/download-artifact@v4 # with: - # name: noirc_abi_wasm + # name: barretenberg-backend # path: - # /usr/src/noir/tooling/noirc_abi_wasm/outputs/out/noirc_abi_wasm - # if-no-files-found: error - # compression-level: 0 - - # test-noirc-abi: - # name: test noirc abi - # runs-on: ubuntu-latest - # 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 artifact + # /usr/src/noir/tooling/noir_js_backend_barretenberg/lib + # - name: artifact # uses: actions/download-artifact@v4 # with: - # name: noirc_abi_wasm + # name: noir-js-types # path: | - # /usr/src/noir/tooling/noirc_abi_wasm + # /usr/src/noir/tooling/noir_js_types/lib + # - name: artifact + # uses: actions/upload-artifact@v4 + # with: + # name: noir_js + # path: + # /usr/src/noir/tooling/noir_js/lib # - name: test # run: | - # /usr/src/noir/.github/scripts/noirc-abi-test.sh + # /usr/src/noir/.github/scripts/noir-js-test.sh - # test-noirc-abi-browser: - # name: test noirc abi browser + # build-noir_codegen: + # name: build noir codegen # runs-on: ubuntu-latest - # needs: [build-base-js, build-noirc-abi] + # needs: [build-base-js, artifact-nargo, test-noirc-abi, test-acvm_js, build-noir-js-types, test-noir_js] # container: # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js # credentials: # username: ${{ github.actor }} # password: ${{ secrets.github_token }} # steps: - # - name: download artifact + # - name: download nargo # uses: actions/download-artifact@v4 # with: - # name: noirc_abi_wasm - # path: | - # /usr/src/noir/tooling/noirc_abi_wasm - # - name: test + # name: nargo + # path: /usr/src/noir/target/release + # - name: prep downloaded artifact # run: | - # /usr/src/noir/.github/scripts/noirc-abi-test-browser.sh - - # build-noir-js-types: - # name: build noir types - # runs-on: ubuntu-latest - # 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 artifact + # chmod +x /usr/src/noir/target/release/nargo + # - name: Download noirc_abi package artifact # uses: actions/download-artifact@v4 # with: # name: noirc_abi_wasm + # path: /usr/src/noir/tooling/noirc_abi_wasm + # - name: Download acvm_js package artifact + # uses: actions/download-artifact@v4 + # with: + # name: acvm_js + # path: /usr/src/noir/acvm-repo/acvm_js + # - name: artifact + # uses: actions/download-artifact@v4 + # with: + # name: noir-js-types # path: | - # /usr/src/noir/tooling/noirc_abi_wasm + # /usr/src/noir/tooling/noir_js_types/lib + # - name: artifact + # uses: actions/download-artifact@v4 + # with: + # name: noir_js + # path: + # /usr/src/noir/tooling/noir_js/lib # - name: build # run: | - # /usr/src/noir/.github/scripts/noir-js-types-build.sh + # /usr/src/noir/.github/scripts/noir-codegen-build.sh # - name: artifact # uses: actions/upload-artifact@v4 # with: - # name: noir-js-types - # path: | - # /usr/src/noir/tooling/noir_js_types/lib - # if-no-files-found: error - # compression-level: 0 - - # build-barretenberg-backend: - # name: build barretenberg backend + # name: noir_codegen + # path: + # /usr/src/noir/tooling/noir_codegen/lib + + # test-noir_codegen: + # name: test noir codegen # runs-on: ubuntu-latest - # needs: [build-base-js, build-noirc-abi, build-noir-js-types] + # needs: [build-base-js, artifact-nargo, test-noirc-abi, test-acvm_js, build-noir-js-types, test-noir_js] # container: # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js # credentials: # username: ${{ github.actor }} # password: ${{ secrets.github_token }} # steps: - # - name: download artifact + # - name: download nargo + # uses: actions/download-artifact@v4 + # with: + # name: nargo + # path: /usr/src/noir/target/release + # - name: prep downloaded artifact + # run: | + # chmod +x /usr/src/noir/target/release/nargo + # - name: Download noirc_abi package artifact # uses: actions/download-artifact@v4 # with: # name: noirc_abi_wasm - # path: | - # /usr/src/noir/tooling/noirc_abi_wasm - # - name: download noir js types + # path: /usr/src/noir/tooling/noirc_abi_wasm + # - name: Download acvm_js package artifact + # uses: actions/download-artifact@v4 + # with: + # name: acvm_js + # path: /usr/src/noir/acvm-repo/acvm_js + # - name: artifact # uses: actions/download-artifact@v4 # with: # name: noir-js-types - # path: /usr/src/noir/tooling/noir_js_types/lib/ - # - name: build - # run: | - # /usr/src/noir/.github/scripts/backend-barretenberg-build.sh + # path: | + # /usr/src/noir/tooling/noir_js_types/lib # - name: artifact - # uses: actions/upload-artifact@v4 + # uses: actions/download-artifact@v4 # with: - # name: barretenberg-backend + # name: noir_js # path: - # /usr/src/noir/tooling/noir_js_backend_barretenberg/lib - # if-no-files-found: error - # compression-level: 0 + # /usr/src/noir/tooling/noir_js/lib + # - name: artifact + # uses: actions/download-artifact@v4 + # with: + # name: noir_codegen + # path: + # /usr/src/noir/tooling/noir_codegen/lib + # - name: test + # run: | + # /usr/src/noir/.github/scripts/noir-codegen-test.sh - # test-barretenberg-backend: - # name: test barretenberg backend + # test-integration: + # name: integration test # runs-on: ubuntu-latest - # needs: [build-base-js, build-noirc-abi, build-noir-js-types] + # needs: [build-base-js, artifact-nargo, test-noir-wasm, test-noirc-abi, test-acvm_js, build-noir-js-types, test-noir_js] # container: # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js # credentials: # username: ${{ github.actor }} # password: ${{ secrets.github_token }} # steps: - # # - name: download artifact - # # uses: actions/download-artifact@v4 - # # with: - # # name: noirc_abi_wasm - # # path: | - # # /usr/src/noir/tooling/noirc_abi_wasm - # # - name: download noir js types - # # uses: actions/download-artifact@v4 - # # with: - # # name: noir-js-types - # # path: /usr/src/noir/tooling/noir_js_types/lib/ - # - name: download backend barretenberg + # - name: download nargo # uses: actions/download-artifact@v4 # with: - # name: barretenberg-backend + # name: nargo + # path: /usr/src/noir/target/release + # - name: prep downloaded artifact + # run: | + # chmod +x /usr/src/noir/target/release/nargo + # - name: Upload artifact + # uses: actions/download-artifact@v4 + # with: + # name: noir_wasm + # path: /usr/src/noir/compiler/wasm/outputs/out/noir_wasm + # - name: Download noirc_abi package artifact + # uses: actions/download-artifact@v4 + # with: + # name: noirc_abi_wasm + # path: /usr/src/noir/tooling/noirc_abi_wasm + # - name: Download acvm_js package artifact + # uses: actions/download-artifact@v4 + # with: + # name: acvm_js + # path: /usr/src/noir/acvm-repo/acvm_js + # - name: Download noir js types + # uses: actions/download-artifact@v4 + # with: + # name: noir-js-types + # path: | + # /usr/src/noir/tooling/noir_js_types/lib + # - name: Download noir js + # uses: actions/download-artifact@v4 + # with: + # name: noir_js # path: - # /usr/src/noir/tooling/noir_js_backend_barretenberg/lib + # /usr/src/noir/tooling/noir_js/lib # - name: test # run: | - # /usr/src/noir/.github/scripts/backend-barretenberg-test.sh - - # # build-noir_js: - # # name: build noirjs - # # runs-on: ubuntu-latest - # # needs: [build-base-js, build-noirc-abi, artifact-nargo, build-acvm_js, build-barretenberg-backend, build-noir-js-types] - # # container: - # # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - # # credentials: - # # username: ${{ github.actor }} - # # password: ${{ secrets.github_token }} - # # steps: - # # - name: download nargo - # # uses: actions/download-artifact@v4 - # # with: - # # name: nargo - # # path: /usr/src/noir/target/release - # # - name: prep downloaded artifact - # # run: | - # # chmod +x /usr/src/noir/target/release/nargo - # # - name: download artifact - # # uses: actions/download-artifact@v4 - # # with: - # # name: noirc_abi_wasm - # # path: | - # # /usr/src/noir/tooling/noirc_abi_wasm - # # - name: download artifact - # # uses: actions/download-artifact@v4 - # # with: - # # name: acvm_js - # # path: | - # # /usr/src/noir/acvm-repo/acvm_js - # # - name: artifact - # # uses: actions/download-artifact@v4 - # # with: - # # name: barretenberg-backend - # # path: - # # /usr/src/noir/tooling/noir_js_backend_barretenberg/lib - # # - name: artifact - # # uses: actions/download-artifact@v4 - # # with: - # # name: noir-js-types - # # path: | - # # /usr/src/noir/tooling/noir_js_types/lib - # # - name: build - # # run: | - # # /usr/src/noir/.github/scripts/build-noir-js.sh - # # - name: artifact - # # uses: actions/upload-artifact@v4 - # # with: - # # name: noir_js - # # path: - # # /usr/src/noir/tooling/noir_js/lib - - # # test-noir_js: - # # name: test noirjs - # # runs-on: ubuntu-latest - # # needs: [ - # # build-base-js, - # # build-noirc-abi, - # # artifact-nargo, - # # build-acvm_js, - # # build-barretenberg-backend, - # # build-noir_js - # # ] - # # container: - # # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - # # credentials: - # # username: ${{ github.actor }} - # # password: ${{ secrets.github_token }} - # # steps: - # # - name: download nargo - # # uses: actions/download-artifact@v4 - # # with: - # # name: nargo - # # path: /usr/src/noir/target/release - # # - name: prep downloaded artifact - # # run: | - # # chmod +x /usr/src/noir/target/release/nargo - # # - name: download artifact - # # uses: actions/download-artifact@v4 - # # with: - # # name: noirc_abi_wasm - # # path: | - # # /usr/src/noir/tooling/noirc_abi_wasm - # # - name: download artifact - # # uses: actions/download-artifact@v4 - # # with: - # # name: acvm_js - # # path: | - # # /usr/src/noir/acvm-repo/acvm_js - # # - name: artifact - # # uses: actions/download-artifact@v4 - # # with: - # # name: barretenberg-backend - # # path: - # # /usr/src/noir/tooling/noir_js_backend_barretenberg/lib - # # - name: artifact - # # uses: actions/download-artifact@v4 - # # with: - # # name: noir-js-types - # # path: | - # # /usr/src/noir/tooling/noir_js_types/lib - # # - name: artifact - # # uses: actions/upload-artifact@v4 - # # with: - # # name: noir_js - # # path: - # # /usr/src/noir/tooling/noir_js/lib - # # - name: test - # # run: | - # # /usr/src/noir/.github/scripts/noir-js-test.sh + # /usr/src/noir/.github/scripts/test-noir-codegen.sh - # # build-noir_codegen: - # # name: build noir codegen - # # runs-on: ubuntu-latest - # # needs: [build-base-js, artifact-nargo, test-noirc-abi, test-acvm_js, build-noir-js-types, test-noir_js] - # # container: - # # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - # # credentials: - # # username: ${{ github.actor }} - # # password: ${{ secrets.github_token }} - # # steps: - # # - name: download nargo - # # uses: actions/download-artifact@v4 - # # with: - # # name: nargo - # # path: /usr/src/noir/target/release - # # - name: prep downloaded artifact - # # run: | - # # chmod +x /usr/src/noir/target/release/nargo - # # - name: Download noirc_abi package artifact - # # uses: actions/download-artifact@v4 - # # with: - # # name: noirc_abi_wasm - # # path: /usr/src/noir/tooling/noirc_abi_wasm - # # - name: Download acvm_js package artifact - # # uses: actions/download-artifact@v4 - # # with: - # # name: acvm_js - # # path: /usr/src/noir/acvm-repo/acvm_js - # # - name: artifact - # # uses: actions/download-artifact@v4 - # # with: - # # name: noir-js-types - # # path: | - # # /usr/src/noir/tooling/noir_js_types/lib - # # - name: artifact - # # uses: actions/download-artifact@v4 - # # with: - # # name: noir_js - # # path: - # # /usr/src/noir/tooling/noir_js/lib - # # - name: build - # # run: | - # # /usr/src/noir/.github/scripts/noir-codegen-build.sh - # # - name: artifact - # # uses: actions/upload-artifact@v4 - # # with: - # # name: noir_codegen - # # path: - # # /usr/src/noir/tooling/noir_codegen/lib - - # # test-noir_codegen: - # # name: test noir codegen - # # runs-on: ubuntu-latest - # # needs: [build-base-js, artifact-nargo, test-noirc-abi, test-acvm_js, build-noir-js-types, test-noir_js] - # # container: - # # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - # # credentials: - # # username: ${{ github.actor }} - # # password: ${{ secrets.github_token }} - # # steps: - # # - name: download nargo - # # uses: actions/download-artifact@v4 - # # with: - # # name: nargo - # # path: /usr/src/noir/target/release - # # - name: prep downloaded artifact - # # run: | - # # chmod +x /usr/src/noir/target/release/nargo - # # - name: Download noirc_abi package artifact - # # uses: actions/download-artifact@v4 - # # with: - # # name: noirc_abi_wasm - # # path: /usr/src/noir/tooling/noirc_abi_wasm - # # - name: Download acvm_js package artifact - # # uses: actions/download-artifact@v4 - # # with: - # # name: acvm_js - # # path: /usr/src/noir/acvm-repo/acvm_js - # # - name: artifact - # # uses: actions/download-artifact@v4 - # # with: - # # name: noir-js-types - # # path: | - # # /usr/src/noir/tooling/noir_js_types/lib - # # - name: artifact - # # uses: actions/download-artifact@v4 - # # with: - # # name: noir_js - # # path: - # # /usr/src/noir/tooling/noir_js/lib - # # - name: artifact - # # uses: actions/download-artifact@v4 - # # with: - # # name: noir_codegen - # # path: - # # /usr/src/noir/tooling/noir_codegen/lib - # # - name: test - # # run: | - # # /usr/src/noir/.github/scripts/noir-codegen-test.sh - - # # test-integration: - # # name: integration test - # # runs-on: ubuntu-latest - # # needs: [build-base-js, artifact-nargo, test-noir-wasm, test-noirc-abi, test-acvm_js, build-noir-js-types, test-noir_js] - # # container: - # # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - # # credentials: - # # username: ${{ github.actor }} - # # password: ${{ secrets.github_token }} - # # steps: - # # - name: download nargo - # # uses: actions/download-artifact@v4 - # # with: - # # name: nargo - # # path: /usr/src/noir/target/release - # # - name: prep downloaded artifact - # # run: | - # # chmod +x /usr/src/noir/target/release/nargo - # # - name: Upload artifact - # # uses: actions/download-artifact@v4 - # # with: - # # name: noir_wasm - # # path: /usr/src/noir/compiler/wasm/outputs/out/noir_wasm - # # - name: Download noirc_abi package artifact - # # uses: actions/download-artifact@v4 - # # with: - # # name: noirc_abi_wasm - # # path: /usr/src/noir/tooling/noirc_abi_wasm - # # - name: Download acvm_js package artifact - # # uses: actions/download-artifact@v4 - # # with: - # # name: acvm_js - # # path: /usr/src/noir/acvm-repo/acvm_js - # # - name: Download noir js types - # # uses: actions/download-artifact@v4 - # # with: - # # name: noir-js-types - # # path: | - # # /usr/src/noir/tooling/noir_js_types/lib - # # - name: Download noir js - # # uses: actions/download-artifact@v4 - # # with: - # # name: noir_js - # # path: - # # /usr/src/noir/tooling/noir_js/lib - # # - name: test - # # run: | - # # /usr/src/noir/.github/scripts/test-noir-codegen.sh - - # # tests-end: - # # name: End - # # runs-on: ubuntu-latest - # # if: ${{ always() }} - # # needs: - # # - test-nargo - # # - test-noirc-abi - # # - test-noir-wasm - # # - test-integration - # # - test-noir_codegen - # # - test-acvm_js - # # - test-barretenberg-backend - # # - test-noir_js + # tests-end: + # name: End + # runs-on: ubuntu-latest + # if: ${{ always() }} + # needs: + # - test-nargo + # - test-noirc-abi + # - test-noir-wasm + # - test-integration + # - test-noir_codegen + # - test-acvm_js + # - test-barretenberg-backend + # - test-noir_js - # # steps: - # # - name: Report overall success - # # run: | - # # if [[ $FAIL == true ]]; then - # # exit 1 - # # else - # # exit 0 - # # fi - # # env: - # # FAIL: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'skipped') }} + # steps: + # - name: Report overall success + # run: | + # if [[ $FAIL == true ]]; then + # exit 1 + # else + # exit 0 + # fi + # env: + # FAIL: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'skipped') }} From 1fccdac23cad905013990abdd7f10ed21a58dd04 Mon Sep 17 00:00:00 2001 From: Esau Date: Mon, 25 Dec 2023 20:41:06 +0100 Subject: [PATCH 160/182] asdf --- .github/workflows/docker-test-flow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index b6217cad1fc..68bcb7163f4 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -384,7 +384,7 @@ jobs: test-barretenberg-backend: name: test barretenberg backend runs-on: ubuntu-latest - needs: [build-base-js, build-noirc-abi, build-noir-js-types] + needs: [build-base-js, build-noirc-abi, build-noir-js-types, build-barretenberg-backend] container: image: ghcr.io/noir-lang/noir:${{ github.sha }}-js credentials: From 26ce4f6d321ad1e88f1cf9d3de8f8ddabcffa181 Mon Sep 17 00:00:00 2001 From: Esau Date: Mon, 25 Dec 2023 21:01:31 +0100 Subject: [PATCH 161/182] asdf --- .github/workflows/docker-test-flow.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 68bcb7163f4..5d73ca1d848 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -391,17 +391,17 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.github_token }} steps: - # - name: download artifact - # uses: actions/download-artifact@v4 - # with: - # name: noirc_abi_wasm - # path: | - # /usr/src/noir/tooling/noirc_abi_wasm - # - name: download noir js types - # uses: actions/download-artifact@v4 - # with: - # name: noir-js-types - # path: /usr/src/noir/tooling/noir_js_types/lib/ + - name: download artifact + uses: actions/download-artifact@v4 + with: + name: noirc_abi_wasm + path: | + /usr/src/noir/tooling/noirc_abi_wasm + - name: download noir js types + uses: actions/download-artifact@v4 + with: + name: noir-js-types + path: /usr/src/noir/tooling/noir_js_types/lib/ - name: download backend barretenberg uses: actions/download-artifact@v4 with: From 9a40584b0647e7f1b31b0b4abe43def9f74eca10 Mon Sep 17 00:00:00 2001 From: Esau Date: Mon, 25 Dec 2023 21:14:14 +0100 Subject: [PATCH 162/182] aasdf --- .github/workflows/docker-test-flow.yml | 415 +++++++++++++------------ 1 file changed, 208 insertions(+), 207 deletions(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 5d73ca1d848..2d2bb8299e5 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -412,216 +412,217 @@ jobs: run: | /usr/src/noir/.github/scripts/backend-barretenberg-test.sh - # build-noir_js: - # name: build noirjs - # runs-on: ubuntu-latest - # needs: [build-base-js, build-noirc-abi, artifact-nargo, build-acvm_js, build-barretenberg-backend, build-noir-js-types] - # container: - # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - # credentials: - # username: ${{ github.actor }} - # password: ${{ secrets.github_token }} - # steps: - # - name: download nargo - # uses: actions/download-artifact@v4 - # with: - # name: nargo - # path: /usr/src/noir/target/release - # - name: prep downloaded artifact - # run: | - # chmod +x /usr/src/noir/target/release/nargo - # - name: download artifact - # uses: actions/download-artifact@v4 - # with: - # name: noirc_abi_wasm - # path: | - # /usr/src/noir/tooling/noirc_abi_wasm - # - name: download artifact - # uses: actions/download-artifact@v4 - # with: - # name: acvm_js - # path: | - # /usr/src/noir/acvm-repo/acvm_js - # - name: artifact - # uses: actions/download-artifact@v4 - # with: - # name: barretenberg-backend - # path: - # /usr/src/noir/tooling/noir_js_backend_barretenberg/lib - # - name: artifact - # uses: actions/download-artifact@v4 - # with: - # name: noir-js-types - # path: | - # /usr/src/noir/tooling/noir_js_types/lib - # - name: build - # run: | - # /usr/src/noir/.github/scripts/build-noir-js.sh - # - name: artifact - # uses: actions/upload-artifact@v4 - # with: - # name: noir_js - # path: - # /usr/src/noir/tooling/noir_js/lib + build-noir_js: + name: build noirjs + runs-on: ubuntu-latest + needs: [build-base-js, build-noirc-abi, build-acvm_js, build-barretenberg-backend, build-noir-js-types] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: download nargo + uses: actions/download-artifact@v4 + with: + name: nargo + path: /usr/src/noir/target/release + - name: prep downloaded artifact + run: | + chmod +x /usr/src/noir/target/release/nargo + - name: download artifact + uses: actions/download-artifact@v4 + with: + name: noirc_abi_wasm + path: | + /usr/src/noir/tooling/noirc_abi_wasm + - name: download artifact + uses: actions/download-artifact@v4 + with: + name: acvm_js + path: | + /usr/src/noir/acvm-repo/acvm_js + - name: artifact + uses: actions/download-artifact@v4 + with: + name: barretenberg-backend + path: + /usr/src/noir/tooling/noir_js_backend_barretenberg/lib + - name: artifact + uses: actions/download-artifact@v4 + with: + name: noir-js-types + path: | + /usr/src/noir/tooling/noir_js_types/lib + - name: build + run: | + /usr/src/noir/.github/scripts/build-noir-js.sh + - name: artifact + uses: actions/upload-artifact@v4 + with: + name: noir_js + path: + /usr/src/noir/tooling/noir_js/lib - # test-noir_js: - # name: test noirjs - # runs-on: ubuntu-latest - # needs: [ - # build-base-js, - # build-noirc-abi, - # artifact-nargo, - # build-acvm_js, - # build-barretenberg-backend, - # build-noir_js - # ] - # container: - # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - # credentials: - # username: ${{ github.actor }} - # password: ${{ secrets.github_token }} - # steps: - # - name: download nargo - # uses: actions/download-artifact@v4 - # with: - # name: nargo - # path: /usr/src/noir/target/release - # - name: prep downloaded artifact - # run: | - # chmod +x /usr/src/noir/target/release/nargo - # - name: download artifact - # uses: actions/download-artifact@v4 - # with: - # name: noirc_abi_wasm - # path: | - # /usr/src/noir/tooling/noirc_abi_wasm - # - name: download artifact - # uses: actions/download-artifact@v4 - # with: - # name: acvm_js - # path: | - # /usr/src/noir/acvm-repo/acvm_js - # - name: artifact - # uses: actions/download-artifact@v4 - # with: - # name: barretenberg-backend - # path: - # /usr/src/noir/tooling/noir_js_backend_barretenberg/lib - # - name: artifact - # uses: actions/download-artifact@v4 - # with: - # name: noir-js-types - # path: | - # /usr/src/noir/tooling/noir_js_types/lib - # - name: artifact - # uses: actions/upload-artifact@v4 - # with: - # name: noir_js - # path: - # /usr/src/noir/tooling/noir_js/lib - # - name: test - # run: | - # /usr/src/noir/.github/scripts/noir-js-test.sh + test-noir_js: + name: test noirjs + runs-on: ubuntu-latest + needs: [ + build-base-js, + build-noirc-abi, + artifact-nargo, + build-acvm_js, + build-barretenberg-backend, + build-noir_js, + build-noir-js-types + ] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: download nargo + uses: actions/download-artifact@v4 + with: + name: nargo + path: /usr/src/noir/target/release + - name: prep downloaded artifact + run: | + chmod +x /usr/src/noir/target/release/nargo + - name: download artifact + uses: actions/download-artifact@v4 + with: + name: noirc_abi_wasm + path: | + /usr/src/noir/tooling/noirc_abi_wasm + - name: download artifact + uses: actions/download-artifact@v4 + with: + name: acvm_js + path: | + /usr/src/noir/acvm-repo/acvm_js + - name: artifact + uses: actions/download-artifact@v4 + with: + name: barretenberg-backend + path: + /usr/src/noir/tooling/noir_js_backend_barretenberg/lib + - name: artifact + uses: actions/download-artifact@v4 + with: + name: noir-js-types + path: | + /usr/src/noir/tooling/noir_js_types/lib + - name: artifact + uses: actions/upload-artifact@v4 + with: + name: noir_js + path: + /usr/src/noir/tooling/noir_js/lib + - name: test + run: | + /usr/src/noir/.github/scripts/noir-js-test.sh - # build-noir_codegen: - # name: build noir codegen - # runs-on: ubuntu-latest - # needs: [build-base-js, artifact-nargo, test-noirc-abi, test-acvm_js, build-noir-js-types, test-noir_js] - # container: - # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - # credentials: - # username: ${{ github.actor }} - # password: ${{ secrets.github_token }} - # steps: - # - name: download nargo - # uses: actions/download-artifact@v4 - # with: - # name: nargo - # path: /usr/src/noir/target/release - # - name: prep downloaded artifact - # run: | - # chmod +x /usr/src/noir/target/release/nargo - # - name: Download noirc_abi package artifact - # uses: actions/download-artifact@v4 - # with: - # name: noirc_abi_wasm - # path: /usr/src/noir/tooling/noirc_abi_wasm - # - name: Download acvm_js package artifact - # uses: actions/download-artifact@v4 - # with: - # name: acvm_js - # path: /usr/src/noir/acvm-repo/acvm_js - # - name: artifact - # uses: actions/download-artifact@v4 - # with: - # name: noir-js-types - # path: | - # /usr/src/noir/tooling/noir_js_types/lib - # - name: artifact - # uses: actions/download-artifact@v4 - # with: - # name: noir_js - # path: - # /usr/src/noir/tooling/noir_js/lib - # - name: build - # run: | - # /usr/src/noir/.github/scripts/noir-codegen-build.sh - # - name: artifact - # uses: actions/upload-artifact@v4 - # with: - # name: noir_codegen - # path: - # /usr/src/noir/tooling/noir_codegen/lib + build-noir_codegen: + name: build noir codegen + runs-on: ubuntu-latest + needs: [build-base-js, build-noirc-abi, build-acvm_js, build-noir-js-types, build-noir_js] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: download nargo + uses: actions/download-artifact@v4 + with: + name: nargo + path: /usr/src/noir/target/release + - name: prep downloaded artifact + run: | + chmod +x /usr/src/noir/target/release/nargo + - name: Download noirc_abi package artifact + uses: actions/download-artifact@v4 + with: + name: noirc_abi_wasm + path: /usr/src/noir/tooling/noirc_abi_wasm + - name: Download acvm_js package artifact + uses: actions/download-artifact@v4 + with: + name: acvm_js + path: /usr/src/noir/acvm-repo/acvm_js + - name: artifact + uses: actions/download-artifact@v4 + with: + name: noir-js-types + path: | + /usr/src/noir/tooling/noir_js_types/lib + - name: artifact + uses: actions/download-artifact@v4 + with: + name: noir_js + path: + /usr/src/noir/tooling/noir_js/lib + - name: build + run: | + /usr/src/noir/.github/scripts/noir-codegen-build.sh + - name: artifact + uses: actions/upload-artifact@v4 + with: + name: noir_codegen + path: + /usr/src/noir/tooling/noir_codegen/lib - # test-noir_codegen: - # name: test noir codegen - # runs-on: ubuntu-latest - # needs: [build-base-js, artifact-nargo, test-noirc-abi, test-acvm_js, build-noir-js-types, test-noir_js] - # container: - # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - # credentials: - # username: ${{ github.actor }} - # password: ${{ secrets.github_token }} - # steps: - # - name: download nargo - # uses: actions/download-artifact@v4 - # with: - # name: nargo - # path: /usr/src/noir/target/release - # - name: prep downloaded artifact - # run: | - # chmod +x /usr/src/noir/target/release/nargo - # - name: Download noirc_abi package artifact - # uses: actions/download-artifact@v4 - # with: - # name: noirc_abi_wasm - # path: /usr/src/noir/tooling/noirc_abi_wasm - # - name: Download acvm_js package artifact - # uses: actions/download-artifact@v4 - # with: - # name: acvm_js - # path: /usr/src/noir/acvm-repo/acvm_js - # - name: artifact - # uses: actions/download-artifact@v4 - # with: - # name: noir-js-types - # path: | - # /usr/src/noir/tooling/noir_js_types/lib - # - name: artifact - # uses: actions/download-artifact@v4 - # with: - # name: noir_js - # path: - # /usr/src/noir/tooling/noir_js/lib - # - name: artifact - # uses: actions/download-artifact@v4 - # with: - # name: noir_codegen - # path: - # /usr/src/noir/tooling/noir_codegen/lib - # - name: test - # run: | - # /usr/src/noir/.github/scripts/noir-codegen-test.sh + test-noir_codegen: + name: test noir codegen + runs-on: ubuntu-latest + needs: [build-base-js, artifact-nargo, build-noirc-abi, build-acvm_js, build-noir-js-types, build-noir_js, build-noir_codegen] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: download nargo + uses: actions/download-artifact@v4 + with: + name: nargo + path: /usr/src/noir/target/release + - name: prep downloaded artifact + run: | + chmod +x /usr/src/noir/target/release/nargo + - name: Download noirc_abi package artifact + uses: actions/download-artifact@v4 + with: + name: noirc_abi_wasm + path: /usr/src/noir/tooling/noirc_abi_wasm + - name: Download acvm_js package artifact + uses: actions/download-artifact@v4 + with: + name: acvm_js + path: /usr/src/noir/acvm-repo/acvm_js + - name: artifact + uses: actions/download-artifact@v4 + with: + name: noir-js-types + path: | + /usr/src/noir/tooling/noir_js_types/lib + - name: artifact + uses: actions/download-artifact@v4 + with: + name: noir_js + path: + /usr/src/noir/tooling/noir_js/lib + - name: artifact + uses: actions/download-artifact@v4 + with: + name: noir_codegen + path: + /usr/src/noir/tooling/noir_codegen/lib + - name: test + run: | + /usr/src/noir/.github/scripts/noir-codegen-test.sh # test-integration: # name: integration test From 87a66d91d4893374cfcecc11e41027be72d9f7c3 Mon Sep 17 00:00:00 2001 From: Esau Date: Mon, 25 Dec 2023 21:25:08 +0100 Subject: [PATCH 163/182] asdf --- .github/workflows/docker-test-flow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 2d2bb8299e5..b83dfbc7b54 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -456,7 +456,7 @@ jobs: /usr/src/noir/tooling/noir_js_types/lib - name: build run: | - /usr/src/noir/.github/scripts/build-noir-js.sh + /usr/src/noir/.github/scripts/noir-js-build.sh - name: artifact uses: actions/upload-artifact@v4 with: From 1c62e8a821b69693b08004928c2bc52762691f46 Mon Sep 17 00:00:00 2001 From: Esau Date: Mon, 25 Dec 2023 22:04:26 +0100 Subject: [PATCH 164/182] asdf --- .github/workflows/docker-test-flow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index b83dfbc7b54..d178d582904 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -515,7 +515,7 @@ jobs: path: | /usr/src/noir/tooling/noir_js_types/lib - name: artifact - uses: actions/upload-artifact@v4 + uses: actions/download-artifact@v4 with: name: noir_js path: From 3b92133ee7e64d7bde2505273547b55d5dbe1359 Mon Sep 17 00:00:00 2001 From: Esau Date: Mon, 25 Dec 2023 22:54:22 +0100 Subject: [PATCH 165/182] asdfasdf --- .github/workflows/docker-test-flow.yml | 150 +++++++++++++------------ 1 file changed, 79 insertions(+), 71 deletions(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index d178d582904..b8b7fcf0e1b 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -624,76 +624,84 @@ jobs: run: | /usr/src/noir/.github/scripts/noir-codegen-test.sh - # test-integration: - # name: integration test - # runs-on: ubuntu-latest - # needs: [build-base-js, artifact-nargo, test-noir-wasm, test-noirc-abi, test-acvm_js, build-noir-js-types, test-noir_js] - # container: - # image: ghcr.io/noir-lang/noir:${{ github.sha }}-js - # credentials: - # username: ${{ github.actor }} - # password: ${{ secrets.github_token }} - # steps: - # - name: download nargo - # uses: actions/download-artifact@v4 - # with: - # name: nargo - # path: /usr/src/noir/target/release - # - name: prep downloaded artifact - # run: | - # chmod +x /usr/src/noir/target/release/nargo - # - name: Upload artifact - # uses: actions/download-artifact@v4 - # with: - # name: noir_wasm - # path: /usr/src/noir/compiler/wasm/outputs/out/noir_wasm - # - name: Download noirc_abi package artifact - # uses: actions/download-artifact@v4 - # with: - # name: noirc_abi_wasm - # path: /usr/src/noir/tooling/noirc_abi_wasm - # - name: Download acvm_js package artifact - # uses: actions/download-artifact@v4 - # with: - # name: acvm_js - # path: /usr/src/noir/acvm-repo/acvm_js - # - name: Download noir js types - # uses: actions/download-artifact@v4 - # with: - # name: noir-js-types - # path: | - # /usr/src/noir/tooling/noir_js_types/lib - # - name: Download noir js - # uses: actions/download-artifact@v4 - # with: - # name: noir_js - # path: - # /usr/src/noir/tooling/noir_js/lib - # - name: test - # run: | - # /usr/src/noir/.github/scripts/test-noir-codegen.sh + test-integration: + name: integration test + runs-on: ubuntu-latest + needs: [build-base-js, artifact-nargo, test-noir-wasm, build-noirc-abi, test-acvm_js, build-noir-js-types, build-noir_js, build-barretenberg-backend] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: download nargo + uses: actions/download-artifact@v4 + with: + name: nargo + path: /usr/src/noir/target/release + - name: prep downloaded artifact + run: | + chmod +x /usr/src/noir/target/release/nargo + - name: Upload artifact + uses: actions/download-artifact@v4 + with: + name: noir_wasm + path: /usr/src/noir/compiler/wasm/outputs/out/noir_wasm + - name: Download noirc_abi package artifact + uses: actions/download-artifact@v4 + with: + name: noirc_abi_wasm + path: /usr/src/noir/tooling/noirc_abi_wasm + - name: Download acvm_js package artifact + uses: actions/download-artifact@v4 + with: + name: acvm_js + path: /usr/src/noir/acvm-repo/acvm_js + - name: Download noir js types + uses: actions/download-artifact@v4 + with: + name: noir-js-types + path: | + /usr/src/noir/tooling/noir_js_types/lib + - name: Download noir js + uses: actions/download-artifact@v4 + with: + name: noir_js + path: + /usr/src/noir/tooling/noir_js/lib + - name: download backend barretenberg + uses: actions/download-artifact@v4 + with: + name: barretenberg-backend + path: + /usr/src/noir/tooling/noir_js_backend_barretenberg/lib + - name: test + run: | + cd /usr/src/noir + npx playwright install && npx playwright install-deps + yarn workspace integration-tests test - # tests-end: - # name: End - # runs-on: ubuntu-latest - # if: ${{ always() }} - # needs: - # - test-nargo - # - test-noirc-abi - # - test-noir-wasm - # - test-integration - # - test-noir_codegen - # - test-acvm_js - # - test-barretenberg-backend - # - test-noir_js + tests-end: + name: End + runs-on: ubuntu-latest + if: ${{ always() }} + needs: + - test-nargo + - test-noirc-abi + - test-noir-wasm + - test-integration + - test-noir_codegen + - test-acvm_js + - test-barretenberg-backend + - test-noir_js - # steps: - # - name: Report overall success - # run: | - # if [[ $FAIL == true ]]; then - # exit 1 - # else - # exit 0 - # fi - # env: - # FAIL: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'skipped') }} + steps: + - name: Report overall success + run: | + if [[ $FAIL == true ]]; then + exit 1 + else + exit 0 + fi + env: + FAIL: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'skipped') }} From 411899730f5e6eb148fc3bcd781aea94b4d14acf Mon Sep 17 00:00:00 2001 From: Esau Date: Mon, 25 Dec 2023 23:45:53 +0100 Subject: [PATCH 166/182] asdf --- .github/workflows/docker-test-flow.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index b8b7fcf0e1b..d9d997da6c7 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -678,6 +678,7 @@ jobs: - name: test run: | cd /usr/src/noir + apt-get install libc++-dev -y npx playwright install && npx playwright install-deps yarn workspace integration-tests test From 48222c8ed0fe0ed078c6cd33eba26399941b1cb9 Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 26 Dec 2023 00:00:40 +0100 Subject: [PATCH 167/182] asdf --- .github/workflows/docker-test-flow.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index d9d997da6c7..0981f4171d7 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -627,7 +627,16 @@ jobs: test-integration: name: integration test runs-on: ubuntu-latest - needs: [build-base-js, artifact-nargo, test-noir-wasm, build-noirc-abi, test-acvm_js, build-noir-js-types, build-noir_js, build-barretenberg-backend] + needs: [ + build-base-js, + artifact-nargo, + build-noir-wasm, + build-noirc-abi, + build-acvm_js, + build-noir-js-types, + build-noir_js, + build-barretenberg-backend + ] container: image: ghcr.io/noir-lang/noir:${{ github.sha }}-js credentials: @@ -646,7 +655,7 @@ jobs: uses: actions/download-artifact@v4 with: name: noir_wasm - path: /usr/src/noir/compiler/wasm/outputs/out/noir_wasm + path: /usr/src/noir/compiler/wasm - name: Download noirc_abi package artifact uses: actions/download-artifact@v4 with: From 200c28fd7261e197d08b52ddf30d09bbd62832f5 Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 2 Jan 2024 16:00:20 +0100 Subject: [PATCH 168/182] clean --- .github/scripts/integration-test.sh | 7 + .github/scripts/integration-tests-build.sh | 0 .github/scripts/integration-tests-test.sh | 0 .../{build-nargo.sh => nargo-build.sh} | 0 .../scripts/{test-nargo.sh => nargo-test.sh} | 0 .github/workflows/docker-test-flow.yml | 215 +++++++++--------- Dockerfile.ci | 2 +- scripts/install_wasm-bindgen-new.sh | 4 - 8 files changed, 114 insertions(+), 114 deletions(-) create mode 100755 .github/scripts/integration-test.sh delete mode 100755 .github/scripts/integration-tests-build.sh delete mode 100755 .github/scripts/integration-tests-test.sh rename .github/scripts/{build-nargo.sh => nargo-build.sh} (100%) rename .github/scripts/{test-nargo.sh => nargo-test.sh} (100%) delete mode 100755 scripts/install_wasm-bindgen-new.sh diff --git a/.github/scripts/integration-test.sh b/.github/scripts/integration-test.sh new file mode 100755 index 00000000000..08f83c8d661 --- /dev/null +++ b/.github/scripts/integration-test.sh @@ -0,0 +1,7 @@ +#!/bin/bash +set -eu + +cd /usr/src/noir +apt-get install libc++-dev -y +npx playwright install && npx playwright install-deps +yarn workspace integration-tests test \ No newline at end of file diff --git a/.github/scripts/integration-tests-build.sh b/.github/scripts/integration-tests-build.sh deleted file mode 100755 index e69de29bb2d..00000000000 diff --git a/.github/scripts/integration-tests-test.sh b/.github/scripts/integration-tests-test.sh deleted file mode 100755 index e69de29bb2d..00000000000 diff --git a/.github/scripts/build-nargo.sh b/.github/scripts/nargo-build.sh similarity index 100% rename from .github/scripts/build-nargo.sh rename to .github/scripts/nargo-build.sh diff --git a/.github/scripts/test-nargo.sh b/.github/scripts/nargo-test.sh similarity index 100% rename from .github/scripts/test-nargo.sh rename to .github/scripts/nargo-test.sh diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 0981f4171d7..2ee516a310d 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -12,7 +12,7 @@ concurrency: jobs: build-base-nargo: - name: Build base nargo + name: Build base docker nargo runs-on: ubuntu-latest steps: - name: Checkout code @@ -24,12 +24,11 @@ jobs: id: prep run: | REGISTRY="ghcr.io" - IMG="${REGISTRY}/${{ github.repository }}" - IMAGE=$(echo "$IMG" | tr '[:upper:]' '[:lower:]') + IMG_RAW="${REGISTRY}/${{ github.repository }}" + IMAGE=$(echo "$IMG_RAW" | tr '[:upper:]' '[:lower:]') TAGS="${IMAGE}:${{ github.sha }}-nargo" - TAGS="${TAGS},${IMAGE}:latest-nargo,${IMAGE}:v${{ steps.date.outputs.date }}-nargo" - # echo ::set-output name=tags::${TAGS} - echo "tags=$TAGS" >> $GITHUB_OUTPUT + FULL_TAGS="${TAGS},${IMAGE}:latest-nargo,${IMAGE}:v${{ steps.date.outputs.date }}-nargo" + echo "tags=$FULL_TAGS" >> $GITHUB_OUTPUT echo "image=$IMAGE" >> $GITHUB_OUTPUT - name: Set up Docker Buildx id: buildx @@ -40,7 +39,7 @@ jobs: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Build cargo + - name: Build nargo base dockerfile uses: docker/build-push-action@v5 with: context: . @@ -52,7 +51,7 @@ jobs: push: true build-base-js: - name: Build base js image + name: Build base js docker image runs-on: ubuntu-latest steps: - name: Checkout code @@ -60,15 +59,15 @@ jobs: - name: Get current date id: date run: echo "date=$(date +'%Y.%m.%d.%H.%M')" >> $GITHUB_STATE - - name: prepare docker images tags + - name: Prepare docker image tags id: prep run: | REGISTRY="ghcr.io" - IMG="${REGISTRY}/${{ github.repository }}" - IMAGE=$(echo "$IMG" | tr '[:upper:]' '[:lower:]') + IMG_RAW="${REGISTRY}/${{ github.repository }}" + IMAGE=$(echo "$IMG_RAW" | tr '[:upper:]' '[:lower:]') TAGS="${IMAGE}:${{ github.sha }}-js" - TAGS="${TAGS},${IMAGE}:latest-js,${IMAGE}:v${{ steps.date.outputs.date }}-js" - echo "tags=$TAGS" >> $GITHUB_OUTPUT + FULL_TAGS="${TAGS},${IMAGE}:latest-js,${IMAGE}:v${{ steps.date.outputs.date }}-js" + echo "tags=$FULL_TAGS" >> $GITHUB_OUTPUT echo "image=$IMAGE" >> $GITHUB_OUTPUT - name: Set up Docker Buildx id: buildx @@ -79,7 +78,7 @@ jobs: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Build cargo + - name: Build js base dockerfile uses: docker/build-push-action@v5 with: context: . @@ -91,7 +90,7 @@ jobs: push: true artifact-nargo: - name: artifact nargo + name: Artifact nargo runs-on: ubuntu-latest needs: [build-base-nargo] container: @@ -100,7 +99,7 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.github_token }} steps: - - name: artifact + - name: Artifact nargo uses: actions/upload-artifact@v4 with: name: nargo @@ -109,7 +108,7 @@ jobs: compression-level: 0 test-nargo: - name: test nargo + name: Test nargo runs-on: ubuntu-latest needs: [build-base-nargo] container: @@ -118,12 +117,12 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.github_token }} steps: - - name: test + - name: Test run: | - /usr/src/noir/.github/scripts/test-nargo.sh + /usr/src/noir/.github/scripts/nargo-test.sh build-noir-wasm: - name: build noir wasm + name: Build noir wasm runs-on: ubuntu-latest needs: [build-base-js] container: @@ -132,10 +131,10 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.github_token }} steps: - - name: build + - name: Build run: | /usr/src/noir/.github/scripts/noir-wasm-build.sh - - name: Upload artifact + - name: Artifact uses: actions/upload-artifact@v4 with: name: noir_wasm @@ -143,7 +142,7 @@ jobs: retention-days: 10 test-noir-wasm: - name: test noir wasm + name: Test noir wasm runs-on: ubuntu-latest needs: [build-base-js, artifact-nargo, build-noir-wasm] container: @@ -152,20 +151,20 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.github_token }} steps: - - name: download nargo + - name: Download nargo uses: actions/download-artifact@v4 with: name: nargo path: /usr/src/noir/target/release - - name: prep downloaded artifact + - name: Prep downloaded artifact run: | chmod +x /usr/src/noir/target/release/nargo - - name: Download noir_wasm package artifact + - name: Download noir_wasm artifact uses: actions/download-artifact@v4 with: name: noir_wasm path: /usr/src/noir/compiler/wasm - - name: test + - name: Test run: | /usr/src/noir/.github/scripts/noir-wasm-test.sh @@ -179,25 +178,25 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.github_token }} steps: - - name: download nargo + - name: Download nargo uses: actions/download-artifact@v4 with: name: nargo path: /usr/src/noir/target/release - - name: prep downloaded artifact + - name: Prep downloaded artifact run: | chmod +x /usr/src/noir/target/release/nargo - - name: Download noir_wasm package artifact + - name: Download noir_wasm artifact uses: actions/download-artifact@v4 with: name: noir_wasm path: /usr/src/noir/compiler/wasm - - name: test + - name: Test run: | /usr/src/noir/.github/scripts/noir-wasm-test-browser.sh build-acvm_js: - name: build acvm js + name: Build acvm js runs-on: ubuntu-latest needs: [build-base-js] container: @@ -206,10 +205,10 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.github_token }} steps: - - name: build + - name: Build run: | /usr/src/noir/.github/scripts/acvm_js-build.sh - - name: artifact + - name: Artifact uses: actions/upload-artifact@v4 with: name: acvm_js @@ -219,7 +218,7 @@ jobs: compression-level: 0 test-acvm_js: - name: test acvm js + name: Test acvm js runs-on: ubuntu-latest needs: [build-base-js, build-acvm_js] container: @@ -228,13 +227,13 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.github_token }} steps: - - name: download artifact + - name: Download acvm js uses: actions/download-artifact@v4 with: name: acvm_js path: | /usr/src/noir/acvm-repo/acvm_js - - name: test + - name: Test run: | /usr/src/noir/.github/scripts/acvm_js-test.sh @@ -248,18 +247,18 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.github_token }} steps: - - name: download artifact + - name: Download acvm js uses: actions/download-artifact@v4 with: name: acvm_js path: | /usr/src/noir/acvm-repo/acvm_js - - name: test + - name: Test run: | /usr/src/noir/.github/scripts/acvm_js-test-browser.sh build-noirc-abi: - name: build noirc abi + name: Build noirc abi runs-on: ubuntu-latest needs: [build-base-js] container: @@ -268,10 +267,10 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.github_token }} steps: - - name: build + - name: Build run: | /usr/src/noir/.github/scripts/noirc-abi-build.sh - - name: artifact + - name: Artifact uses: actions/upload-artifact@v4 with: name: noirc_abi_wasm @@ -281,7 +280,7 @@ jobs: compression-level: 0 test-noirc-abi: - name: test noirc abi + name: Test noirc abi runs-on: ubuntu-latest needs: [build-base-js, build-noirc-abi] container: @@ -290,18 +289,18 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.github_token }} steps: - - name: download artifact + - name: Download noirc abi uses: actions/download-artifact@v4 with: name: noirc_abi_wasm path: | /usr/src/noir/tooling/noirc_abi_wasm - - name: test + - name: Test run: | /usr/src/noir/.github/scripts/noirc-abi-test.sh test-noirc-abi-browser: - name: test noirc abi browser + name: Test noirc abi browser runs-on: ubuntu-latest needs: [build-base-js, build-noirc-abi] container: @@ -310,18 +309,18 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.github_token }} steps: - - name: download artifact + - name: Download noirc abi uses: actions/download-artifact@v4 with: name: noirc_abi_wasm path: | /usr/src/noir/tooling/noirc_abi_wasm - - name: test + - name: Test run: | /usr/src/noir/.github/scripts/noirc-abi-test-browser.sh build-noir-js-types: - name: build noir types + name: Build noir js types runs-on: ubuntu-latest needs: [build-base-js, build-noirc-abi] container: @@ -330,16 +329,16 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.github_token }} steps: - - name: download artifact + - name: Download noirc abi uses: actions/download-artifact@v4 with: name: noirc_abi_wasm path: | /usr/src/noir/tooling/noirc_abi_wasm - - name: build + - name: Build run: | /usr/src/noir/.github/scripts/noir-js-types-build.sh - - name: artifact + - name: Artifact uses: actions/upload-artifact@v4 with: name: noir-js-types @@ -349,7 +348,7 @@ jobs: compression-level: 0 build-barretenberg-backend: - name: build barretenberg backend + name: Build Barretenberg backend runs-on: ubuntu-latest needs: [build-base-js, build-noirc-abi, build-noir-js-types] container: @@ -358,21 +357,21 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.github_token }} steps: - - name: download artifact + - 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 js types + - name: Download noir js types uses: actions/download-artifact@v4 with: name: noir-js-types path: /usr/src/noir/tooling/noir_js_types/lib/ - - name: build + - name: Build run: | /usr/src/noir/.github/scripts/backend-barretenberg-build.sh - - name: artifact + - name: Artifact uses: actions/upload-artifact@v4 with: name: barretenberg-backend @@ -382,7 +381,7 @@ jobs: compression-level: 0 test-barretenberg-backend: - name: test barretenberg backend + name: Test Barretenberg backend runs-on: ubuntu-latest needs: [build-base-js, build-noirc-abi, build-noir-js-types, build-barretenberg-backend] container: @@ -391,29 +390,29 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.github_token }} steps: - - name: download artifact + - name: Download artifact uses: actions/download-artifact@v4 with: name: noirc_abi_wasm path: | /usr/src/noir/tooling/noirc_abi_wasm - - name: download noir js types + - name: Download noir js types uses: actions/download-artifact@v4 with: name: noir-js-types path: /usr/src/noir/tooling/noir_js_types/lib/ - - name: download backend barretenberg + - name: Download Backend barretenberg uses: actions/download-artifact@v4 with: name: barretenberg-backend path: /usr/src/noir/tooling/noir_js_backend_barretenberg/lib - - name: test + - name: Test run: | /usr/src/noir/.github/scripts/backend-barretenberg-test.sh build-noir_js: - name: build noirjs + name: Build noirjs runs-on: ubuntu-latest needs: [build-base-js, build-noirc-abi, build-acvm_js, build-barretenberg-backend, build-noir-js-types] container: @@ -422,7 +421,7 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.github_token }} steps: - - name: download nargo + - name: Download nargo uses: actions/download-artifact@v4 with: name: nargo @@ -430,34 +429,34 @@ jobs: - name: prep downloaded artifact run: | chmod +x /usr/src/noir/target/release/nargo - - name: download artifact + - name: Download noirc abi uses: actions/download-artifact@v4 with: name: noirc_abi_wasm path: | /usr/src/noir/tooling/noirc_abi_wasm - - name: download artifact + - name: Download acvm js uses: actions/download-artifact@v4 with: name: acvm_js path: | /usr/src/noir/acvm-repo/acvm_js - - name: artifact + - name: Download Barretenberg backend uses: actions/download-artifact@v4 with: name: barretenberg-backend path: /usr/src/noir/tooling/noir_js_backend_barretenberg/lib - - name: artifact + - name: Download noir js types uses: actions/download-artifact@v4 with: name: noir-js-types path: | /usr/src/noir/tooling/noir_js_types/lib - - name: build + - name: Build run: | /usr/src/noir/.github/scripts/noir-js-build.sh - - name: artifact + - name: Artifact uses: actions/upload-artifact@v4 with: name: noir_js @@ -465,7 +464,7 @@ jobs: /usr/src/noir/tooling/noir_js/lib test-noir_js: - name: test noirjs + name: Test noirjs runs-on: ubuntu-latest needs: [ build-base-js, @@ -482,50 +481,50 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.github_token }} steps: - - name: download nargo + - name: Download nargo uses: actions/download-artifact@v4 with: name: nargo path: /usr/src/noir/target/release - - name: prep downloaded artifact + - name: Prep downloaded artifact run: | chmod +x /usr/src/noir/target/release/nargo - - name: download artifact + - name: Download noirc abi uses: actions/download-artifact@v4 with: name: noirc_abi_wasm path: | /usr/src/noir/tooling/noirc_abi_wasm - - name: download artifact + - name: Download acvm js uses: actions/download-artifact@v4 with: name: acvm_js path: | /usr/src/noir/acvm-repo/acvm_js - - name: artifact + - name: Download Barretenberg backend uses: actions/download-artifact@v4 with: name: barretenberg-backend path: /usr/src/noir/tooling/noir_js_backend_barretenberg/lib - - name: artifact + - name: Download noir js types uses: actions/download-artifact@v4 with: name: noir-js-types path: | /usr/src/noir/tooling/noir_js_types/lib - - name: artifact + - name: Download noir js uses: actions/download-artifact@v4 with: name: noir_js path: /usr/src/noir/tooling/noir_js/lib - - name: test + - name: Test run: | /usr/src/noir/.github/scripts/noir-js-test.sh build-noir_codegen: - name: build noir codegen + name: Build noir codegen runs-on: ubuntu-latest needs: [build-base-js, build-noirc-abi, build-acvm_js, build-noir-js-types, build-noir_js] container: @@ -534,40 +533,40 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.github_token }} steps: - - name: download nargo + - name: Download nargo uses: actions/download-artifact@v4 with: name: nargo path: /usr/src/noir/target/release - - name: prep downloaded artifact + - name: Prep downloaded artifact run: | chmod +x /usr/src/noir/target/release/nargo - - name: Download noirc_abi package artifact + - name: Download noirc abi package uses: actions/download-artifact@v4 with: name: noirc_abi_wasm path: /usr/src/noir/tooling/noirc_abi_wasm - - name: Download acvm_js package artifact + - name: Download acvm js uses: actions/download-artifact@v4 with: name: acvm_js path: /usr/src/noir/acvm-repo/acvm_js - - name: artifact + - name: Download noir js types uses: actions/download-artifact@v4 with: name: noir-js-types path: | /usr/src/noir/tooling/noir_js_types/lib - - name: artifact + - name: Download noir js uses: actions/download-artifact@v4 with: name: noir_js path: /usr/src/noir/tooling/noir_js/lib - - name: build + - name: Build run: | /usr/src/noir/.github/scripts/noir-codegen-build.sh - - name: artifact + - name: Artifact uses: actions/upload-artifact@v4 with: name: noir_codegen @@ -575,7 +574,7 @@ jobs: /usr/src/noir/tooling/noir_codegen/lib test-noir_codegen: - name: test noir codegen + name: Test noir codegen runs-on: ubuntu-latest needs: [build-base-js, artifact-nargo, build-noirc-abi, build-acvm_js, build-noir-js-types, build-noir_js, build-noir_codegen] container: @@ -584,48 +583,48 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.github_token }} steps: - - name: download nargo + - name: Download nargo uses: actions/download-artifact@v4 with: name: nargo path: /usr/src/noir/target/release - - name: prep downloaded artifact + - name: Prep downloaded artifact run: | chmod +x /usr/src/noir/target/release/nargo - - name: Download noirc_abi package artifact + - name: Download noirc abi uses: actions/download-artifact@v4 with: name: noirc_abi_wasm path: /usr/src/noir/tooling/noirc_abi_wasm - - name: Download acvm_js package artifact + - name: Download acvm js uses: actions/download-artifact@v4 with: name: acvm_js path: /usr/src/noir/acvm-repo/acvm_js - - name: artifact + - name: Download noir js types uses: actions/download-artifact@v4 with: name: noir-js-types path: | /usr/src/noir/tooling/noir_js_types/lib - - name: artifact + - name: Download noir js uses: actions/download-artifact@v4 with: name: noir_js path: /usr/src/noir/tooling/noir_js/lib - - name: artifact + - name: Download noir codegen uses: actions/download-artifact@v4 with: name: noir_codegen path: /usr/src/noir/tooling/noir_codegen/lib - - name: test + - name: Test run: | /usr/src/noir/.github/scripts/noir-codegen-test.sh test-integration: - name: integration test + name: Integration test runs-on: ubuntu-latest needs: [ build-base-js, @@ -643,25 +642,25 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.github_token }} steps: - - name: download nargo + - name: Download nargo uses: actions/download-artifact@v4 with: name: nargo path: /usr/src/noir/target/release - - name: prep downloaded artifact + - name: Prep downloaded artifact run: | chmod +x /usr/src/noir/target/release/nargo - - name: Upload artifact + - name: Download noir wasm uses: actions/download-artifact@v4 with: name: noir_wasm path: /usr/src/noir/compiler/wasm - - name: Download noirc_abi package artifact + - name: Download noirc abi uses: actions/download-artifact@v4 with: name: noirc_abi_wasm path: /usr/src/noir/tooling/noirc_abi_wasm - - name: Download acvm_js package artifact + - name: Download acvm js uses: actions/download-artifact@v4 with: name: acvm_js @@ -678,18 +677,16 @@ jobs: name: noir_js path: /usr/src/noir/tooling/noir_js/lib - - name: download backend barretenberg + - name: Download Barretenberg backend uses: actions/download-artifact@v4 with: name: barretenberg-backend path: /usr/src/noir/tooling/noir_js_backend_barretenberg/lib - - name: test + - name: Test run: | - cd /usr/src/noir - apt-get install libc++-dev -y - npx playwright install && npx playwright install-deps - yarn workspace integration-tests test + /usr/src/noir/.github/scripts/integration-test.sh + tests-end: name: End diff --git a/Dockerfile.ci b/Dockerfile.ci index ee26a71f392..57dcbe9cfee 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -5,7 +5,7 @@ ENV PATH="${PATH}:/usr/src/noir/target/release" FROM base as base-nargo COPY . . -RUN .github/scripts/build-nargo.sh +RUN .github/scripts/nargo-build.sh FROM base as base-js RUN apt-get install -y ca-certificates curl gnupg diff --git a/scripts/install_wasm-bindgen-new.sh b/scripts/install_wasm-bindgen-new.sh deleted file mode 100755 index b3177282894..00000000000 --- a/scripts/install_wasm-bindgen-new.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -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-bindgen-cli --version 0.2.86 -y From b7784ef748db9a04842b99123613b81f76b713e0 Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 2 Jan 2024 17:05:27 +0100 Subject: [PATCH 169/182] asdf --- .github/scripts/acvm_js-build.sh | 2 +- .github/scripts/install_wasm-bindgen.sh | 5 +++++ .github/scripts/noir-wasm-build.sh | 2 +- .github/scripts/noirc-abi-build.sh | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 .github/scripts/install_wasm-bindgen.sh diff --git a/.github/scripts/acvm_js-build.sh b/.github/scripts/acvm_js-build.sh index 37ca141760f..492f9b95c35 100755 --- a/.github/scripts/acvm_js-build.sh +++ b/.github/scripts/acvm_js-build.sh @@ -2,5 +2,5 @@ set -eu cd /usr/src/noir -./scripts/install_wasm-bindgen-new.sh +.github/scripts/install_wasm-bindgen.sh yarn workspace @noir-lang/acvm_js build diff --git a/.github/scripts/install_wasm-bindgen.sh b/.github/scripts/install_wasm-bindgen.sh new file mode 100644 index 00000000000..b8c41393ab0 --- /dev/null +++ b/.github/scripts/install_wasm-bindgen.sh @@ -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-bindgen-cli --version 0.2.86 -y diff --git a/.github/scripts/noir-wasm-build.sh b/.github/scripts/noir-wasm-build.sh index 739efaa04a8..e950e5dff3a 100755 --- a/.github/scripts/noir-wasm-build.sh +++ b/.github/scripts/noir-wasm-build.sh @@ -2,5 +2,5 @@ set -eu cd /usr/src/noir -./scripts/install_wasm-bindgen-new.sh +.github/scripts/install_wasm-bindgen.sh yarn workspace @noir-lang/noir_wasm build \ No newline at end of file diff --git a/.github/scripts/noirc-abi-build.sh b/.github/scripts/noirc-abi-build.sh index 1fd747fca3a..d06bb4c0873 100755 --- a/.github/scripts/noirc-abi-build.sh +++ b/.github/scripts/noirc-abi-build.sh @@ -2,5 +2,5 @@ set -eu cd /usr/src/noir -./scripts/install_wasm-bindgen-new.sh +.github/scripts/install_wasm-bindgen.sh yarn workspace @noir-lang/noirc_abi build From f223842662bd0b7586a10615414e56f556d1e141 Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 2 Jan 2024 18:12:45 +0100 Subject: [PATCH 170/182] asdf --- .github/scripts/install_wasm-bindgen.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 .github/scripts/install_wasm-bindgen.sh diff --git a/.github/scripts/install_wasm-bindgen.sh b/.github/scripts/install_wasm-bindgen.sh old mode 100644 new mode 100755 From ba8ea2267534cbbc9648f6f9c47fa17d649434ee Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 2 Jan 2024 22:12:39 +0100 Subject: [PATCH 171/182] test --- .github/workflows/docker-test-flow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 2ee516a310d..0c49754836d 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -1,4 +1,4 @@ -name: Test github artifacts +name: Test Nargo and JS packages on: push: From 12ace084a69714a27a4d3ce91dad5988b75751bf Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 2 Jan 2024 22:30:32 +0100 Subject: [PATCH 172/182] tet --- .github/workflows/docker-test-flow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 0c49754836d..882594d7945 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -414,7 +414,7 @@ jobs: build-noir_js: name: Build noirjs runs-on: ubuntu-latest - needs: [build-base-js, build-noirc-abi, build-acvm_js, build-barretenberg-backend, build-noir-js-types] + needs: [build-base-js, artifact-nargo, build-noirc-abi, build-acvm_js, build-barretenberg-backend, build-noir-js-types] container: image: ghcr.io/noir-lang/noir:${{ github.sha }}-js credentials: From 838c6197561ac6beeca4276785d634ec7ebc9e38 Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 2 Jan 2024 22:54:29 +0100 Subject: [PATCH 173/182] bump --- .github/workflows/docker-test-flow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 882594d7945..3b97f3440eb 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -3,7 +3,7 @@ name: Test Nargo and JS packages on: push: branches: - # - 'master' + # - 'master' # - 'cache-docker-artifacts' concurrency: From c8e5852df8ac6042230ffe8f2f6c52aadf59ba79 Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 2 Jan 2024 23:00:45 +0100 Subject: [PATCH 174/182] asdf --- .github/workflows/docker-test-flow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 3b97f3440eb..6fa9e801298 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -12,7 +12,7 @@ concurrency: jobs: build-base-nargo: - name: Build base docker nargo + name: Build base nargo docker image runs-on: ubuntu-latest steps: - name: Checkout code From 1f7b988f811cbc9b99f8ab2bb85c18b047cf4330 Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 3 Jan 2024 15:07:43 +0100 Subject: [PATCH 175/182] fix --- .github/workflows/docker-test-flow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 6fa9e801298..9548aeee450 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -169,7 +169,7 @@ jobs: /usr/src/noir/.github/scripts/noir-wasm-test.sh test-noir-wasm-browser: - name: test noir wasm browser + name: Test noir wasm browser runs-on: ubuntu-latest needs: [build-base-js, artifact-nargo, build-noir-wasm] container: @@ -238,7 +238,7 @@ jobs: /usr/src/noir/.github/scripts/acvm_js-test.sh test-acvm_js-browser: - name: test acvm js browser + name: Test acvm js browser runs-on: ubuntu-latest needs: [build-base-js, build-acvm_js] container: From 9fe2d7997d2c9c04815aa89da324976e64a31ffb Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 3 Jan 2024 17:06:03 +0100 Subject: [PATCH 176/182] asdf --- .github/workflows/docker-test-flow.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 9548aeee450..16042ae7127 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -687,7 +687,6 @@ jobs: run: | /usr/src/noir/.github/scripts/integration-test.sh - tests-end: name: End runs-on: ubuntu-latest @@ -695,10 +694,13 @@ jobs: needs: - test-nargo - test-noirc-abi + - test-noirc-abi-browser - test-noir-wasm + - test-noir-wasm-browser - test-integration - test-noir_codegen - test-acvm_js + - test-acvm_js-browser - test-barretenberg-backend - test-noir_js From c77df3c57f7ebab921e091b058082abca7aafec5 Mon Sep 17 00:00:00 2001 From: Esau Date: Thu, 4 Jan 2024 16:30:30 +0100 Subject: [PATCH 177/182] test move --- .github/scripts/noir-wasm-build.sh | 1 - .github/workflows/docker-test-flow.yml | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/scripts/noir-wasm-build.sh b/.github/scripts/noir-wasm-build.sh index e950e5dff3a..4523751612d 100755 --- a/.github/scripts/noir-wasm-build.sh +++ b/.github/scripts/noir-wasm-build.sh @@ -1,6 +1,5 @@ #!/bin/bash set -eu -cd /usr/src/noir .github/scripts/install_wasm-bindgen.sh yarn workspace @noir-lang/noir_wasm build \ No newline at end of file diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 16042ae7127..6562a5d4828 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -132,8 +132,9 @@ jobs: password: ${{ secrets.github_token }} steps: - name: Build + working-directory: /usr/src/noir run: | - /usr/src/noir/.github/scripts/noir-wasm-build.sh + ./.github/scripts/noir-wasm-build.sh - name: Artifact uses: actions/upload-artifact@v4 with: From e0c7f7f1176eeff14e43578262ba5ace14022e43 Mon Sep 17 00:00:00 2001 From: Esau Date: Tue, 9 Jan 2024 23:55:48 +0100 Subject: [PATCH 178/182] test --- .github/scripts/acvm_js-build.sh | 1 - .github/scripts/acvm_js-test-browser.sh | 1 - .github/scripts/acvm_js-test.sh | 1 - .github/scripts/backend-barretenberg-build.sh | 1 - .github/scripts/backend-barretenberg-test.sh | 1 - .github/scripts/integration-test.sh | 1 - .github/scripts/nargo-build.sh | 1 - .github/scripts/nargo-test.sh | 1 - .github/scripts/noir-codegen-build.sh | 1 - .github/scripts/noir-codegen-test.sh | 1 - .github/scripts/noir-js-build.sh | 1 - .github/scripts/noir-js-test.sh | 1 - .github/scripts/noir-js-types-build.sh | 1 - .github/scripts/noir-wasm-test-browser.sh | 1 - .github/scripts/noir-wasm-test.sh | 1 - .github/scripts/noirc-abi-build.sh | 1 - .github/scripts/noirc-abi-test-browser.sh | 1 - .github/scripts/noirc-abi-test.sh | 1 - .github/workflows/docker-test-flow.yml | 51 ++++++++++++------- 19 files changed, 34 insertions(+), 35 deletions(-) diff --git a/.github/scripts/acvm_js-build.sh b/.github/scripts/acvm_js-build.sh index 492f9b95c35..0565a9bb89f 100755 --- a/.github/scripts/acvm_js-build.sh +++ b/.github/scripts/acvm_js-build.sh @@ -1,6 +1,5 @@ #!/bin/bash set -eu -cd /usr/src/noir .github/scripts/install_wasm-bindgen.sh yarn workspace @noir-lang/acvm_js build diff --git a/.github/scripts/acvm_js-test-browser.sh b/.github/scripts/acvm_js-test-browser.sh index 169362f8843..598c98dadf2 100755 --- a/.github/scripts/acvm_js-test-browser.sh +++ b/.github/scripts/acvm_js-test-browser.sh @@ -1,6 +1,5 @@ #!/bin/bash set -eu -cd /usr/src/noir npx playwright install && npx playwright install-deps yarn workspace @noir-lang/acvm_js test:browser diff --git a/.github/scripts/acvm_js-test.sh b/.github/scripts/acvm_js-test.sh index e42bb3b7243..d5519d26cc4 100755 --- a/.github/scripts/acvm_js-test.sh +++ b/.github/scripts/acvm_js-test.sh @@ -1,5 +1,4 @@ #!/bin/bash set -eu -cd /usr/src/noir yarn workspace @noir-lang/acvm_js test diff --git a/.github/scripts/backend-barretenberg-build.sh b/.github/scripts/backend-barretenberg-build.sh index df311c408cd..d90995397d8 100755 --- a/.github/scripts/backend-barretenberg-build.sh +++ b/.github/scripts/backend-barretenberg-build.sh @@ -1,5 +1,4 @@ #!/bin/bash set -eu -cd /usr/src/noir yarn workspace @noir-lang/backend_barretenberg build diff --git a/.github/scripts/backend-barretenberg-test.sh b/.github/scripts/backend-barretenberg-test.sh index 36476880c5f..1bd6f8e410d 100755 --- a/.github/scripts/backend-barretenberg-test.sh +++ b/.github/scripts/backend-barretenberg-test.sh @@ -1,5 +1,4 @@ #!/bin/bash set -eu -cd /usr/src/noir yarn workspace @noir-lang/backend_barretenberg test diff --git a/.github/scripts/integration-test.sh b/.github/scripts/integration-test.sh index 08f83c8d661..4e1b52cedf9 100755 --- a/.github/scripts/integration-test.sh +++ b/.github/scripts/integration-test.sh @@ -1,7 +1,6 @@ #!/bin/bash set -eu -cd /usr/src/noir apt-get install libc++-dev -y npx playwright install && npx playwright install-deps yarn workspace integration-tests test \ No newline at end of file diff --git a/.github/scripts/nargo-build.sh b/.github/scripts/nargo-build.sh index 92e2399f746..2115732ab7e 100755 --- a/.github/scripts/nargo-build.sh +++ b/.github/scripts/nargo-build.sh @@ -1,7 +1,6 @@ #!/bin/bash set -eu -cd /usr/src/noir export SOURCE_DATE_EPOCH=$(date +%s) export GIT_DIRTY=false export GIT_COMMIT=$(git rev-parse --verify HEAD) diff --git a/.github/scripts/nargo-test.sh b/.github/scripts/nargo-test.sh index 292f52750b8..9234df7bf5c 100755 --- a/.github/scripts/nargo-test.sh +++ b/.github/scripts/nargo-test.sh @@ -1,7 +1,6 @@ #!/bin/bash set -eu -cd /usr/src/noir apt-get install -y curl libc++-dev export SOURCE_DATE_EPOCH=$(date +%s) diff --git a/.github/scripts/noir-codegen-build.sh b/.github/scripts/noir-codegen-build.sh index 52ae4b147ff..d42be4d676e 100755 --- a/.github/scripts/noir-codegen-build.sh +++ b/.github/scripts/noir-codegen-build.sh @@ -1,5 +1,4 @@ #!/bin/bash set -eu -cd /usr/src/noir yarn workspace @noir-lang/noir_codegen build diff --git a/.github/scripts/noir-codegen-test.sh b/.github/scripts/noir-codegen-test.sh index f24d4191803..10fa832501a 100755 --- a/.github/scripts/noir-codegen-test.sh +++ b/.github/scripts/noir-codegen-test.sh @@ -1,7 +1,6 @@ #!/bin/bash set -eu -cd /usr/src/noir ./scripts/nargo_compile_noir_codegen_assert_lt.sh rm -rf /usr/src/noir/tooling/noir_codegen/test/assert_lt/target/debug_assert_lt.json yarn workspace @noir-lang/noir_codegen test \ No newline at end of file diff --git a/.github/scripts/noir-js-build.sh b/.github/scripts/noir-js-build.sh index 498c31aa36f..04367e41342 100755 --- a/.github/scripts/noir-js-build.sh +++ b/.github/scripts/noir-js-build.sh @@ -1,5 +1,4 @@ #!/bin/bash set -eu -cd /usr/src/noir yarn workspace @noir-lang/noir_js build diff --git a/.github/scripts/noir-js-test.sh b/.github/scripts/noir-js-test.sh index 319c4f50c51..b5fe34038fe 100755 --- a/.github/scripts/noir-js-test.sh +++ b/.github/scripts/noir-js-test.sh @@ -1,7 +1,6 @@ #!/bin/bash set -eu -cd /usr/src/noir ./scripts/nargo_compile_noir_js_assert_lt.sh rm -rf /usr/src/noir/tooling/noir_js/test/noir_compiled_examples/assert_lt/target/debug_assert_lt.json yarn workspace @noir-lang/noir_js test \ No newline at end of file diff --git a/.github/scripts/noir-js-types-build.sh b/.github/scripts/noir-js-types-build.sh index 5b0c0416e2b..77b08651d68 100755 --- a/.github/scripts/noir-js-types-build.sh +++ b/.github/scripts/noir-js-types-build.sh @@ -1,5 +1,4 @@ #!/bin/bash set -eu -cd /usr/src/noir yarn workspace @noir-lang/types build \ No newline at end of file diff --git a/.github/scripts/noir-wasm-test-browser.sh b/.github/scripts/noir-wasm-test-browser.sh index ac92b55835d..4b584abce23 100755 --- a/.github/scripts/noir-wasm-test-browser.sh +++ b/.github/scripts/noir-wasm-test-browser.sh @@ -1,7 +1,6 @@ #!/bin/bash set -eu -cd /usr/src/noir ./scripts/nargo_compile_wasm_fixtures.sh npx playwright install && npx playwright install-deps yarn workspace @noir-lang/noir_wasm test:browser \ No newline at end of file diff --git a/.github/scripts/noir-wasm-test.sh b/.github/scripts/noir-wasm-test.sh index 5321e257d3b..03e1bac2330 100755 --- a/.github/scripts/noir-wasm-test.sh +++ b/.github/scripts/noir-wasm-test.sh @@ -1,7 +1,6 @@ #!/bin/bash set -eu -cd /usr/src/noir ./scripts/nargo_compile_wasm_fixtures.sh yarn workspace @noir-lang/noir_wasm test:node npx playwright install && npx playwright install-deps diff --git a/.github/scripts/noirc-abi-build.sh b/.github/scripts/noirc-abi-build.sh index d06bb4c0873..d5da6deaa0f 100755 --- a/.github/scripts/noirc-abi-build.sh +++ b/.github/scripts/noirc-abi-build.sh @@ -1,6 +1,5 @@ #!/bin/bash set -eu -cd /usr/src/noir .github/scripts/install_wasm-bindgen.sh yarn workspace @noir-lang/noirc_abi build diff --git a/.github/scripts/noirc-abi-test-browser.sh b/.github/scripts/noirc-abi-test-browser.sh index bcbef07a7d8..7a966cb5e94 100755 --- a/.github/scripts/noirc-abi-test-browser.sh +++ b/.github/scripts/noirc-abi-test-browser.sh @@ -1,6 +1,5 @@ #!/bin/bash set -eu -cd /usr/src/noir npx playwright install && npx playwright install-deps yarn workspace @noir-lang/noirc_abi test:browser diff --git a/.github/scripts/noirc-abi-test.sh b/.github/scripts/noirc-abi-test.sh index 6f55bfed625..39ca0a44b07 100755 --- a/.github/scripts/noirc-abi-test.sh +++ b/.github/scripts/noirc-abi-test.sh @@ -1,5 +1,4 @@ #!/bin/bash set -eu -cd /usr/src/noir yarn workspace @noir-lang/noirc_abi test diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 6562a5d4828..750cd58cc6c 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -118,8 +118,9 @@ jobs: password: ${{ secrets.github_token }} steps: - name: Test + working-directory: /usr/src/noir run: | - /usr/src/noir/.github/scripts/nargo-test.sh + .github/scripts/nargo-test.sh build-noir-wasm: name: Build noir wasm @@ -166,8 +167,9 @@ jobs: name: noir_wasm path: /usr/src/noir/compiler/wasm - name: Test + working-directory: /usr/src/noir run: | - /usr/src/noir/.github/scripts/noir-wasm-test.sh + ./.github/scripts/noir-wasm-test.sh test-noir-wasm-browser: name: Test noir wasm browser @@ -193,8 +195,9 @@ jobs: name: noir_wasm path: /usr/src/noir/compiler/wasm - name: Test + working-directory: /usr/src/noir run: | - /usr/src/noir/.github/scripts/noir-wasm-test-browser.sh + ./.github/scripts/noir-wasm-test-browser.sh build-acvm_js: name: Build acvm js @@ -207,8 +210,9 @@ jobs: password: ${{ secrets.github_token }} steps: - name: Build + working-directory: /usr/src/noir run: | - /usr/src/noir/.github/scripts/acvm_js-build.sh + ./.github/scripts/acvm_js-build.sh - name: Artifact uses: actions/upload-artifact@v4 with: @@ -235,8 +239,9 @@ jobs: path: | /usr/src/noir/acvm-repo/acvm_js - name: Test + working-directory: /usr/src/noir run: | - /usr/src/noir/.github/scripts/acvm_js-test.sh + ./.github/scripts/acvm_js-test.sh test-acvm_js-browser: name: Test acvm js browser @@ -255,8 +260,9 @@ jobs: path: | /usr/src/noir/acvm-repo/acvm_js - name: Test + working-directory: /usr/src/noir run: | - /usr/src/noir/.github/scripts/acvm_js-test-browser.sh + ./.github/scripts/acvm_js-test-browser.sh build-noirc-abi: name: Build noirc abi @@ -269,8 +275,9 @@ jobs: password: ${{ secrets.github_token }} steps: - name: Build + working-directory: /usr/src/noir run: | - /usr/src/noir/.github/scripts/noirc-abi-build.sh + ./.github/scripts/noirc-abi-build.sh - name: Artifact uses: actions/upload-artifact@v4 with: @@ -297,8 +304,9 @@ jobs: path: | /usr/src/noir/tooling/noirc_abi_wasm - name: Test + working-directory: /usr/src/noir run: | - /usr/src/noir/.github/scripts/noirc-abi-test.sh + ./.github/scripts/noirc-abi-test.sh test-noirc-abi-browser: name: Test noirc abi browser @@ -317,8 +325,9 @@ jobs: path: | /usr/src/noir/tooling/noirc_abi_wasm - name: Test + working-directory: /usr/src/noir run: | - /usr/src/noir/.github/scripts/noirc-abi-test-browser.sh + ./.github/scripts/noirc-abi-test-browser.sh build-noir-js-types: name: Build noir js types @@ -337,8 +346,9 @@ jobs: path: | /usr/src/noir/tooling/noirc_abi_wasm - name: Build + working-directory: /usr/src/noir run: | - /usr/src/noir/.github/scripts/noir-js-types-build.sh + ./.github/scripts/noir-js-types-build.sh - name: Artifact uses: actions/upload-artifact@v4 with: @@ -370,8 +380,9 @@ jobs: name: noir-js-types path: /usr/src/noir/tooling/noir_js_types/lib/ - name: Build + working-directory: /usr/src/noir run: | - /usr/src/noir/.github/scripts/backend-barretenberg-build.sh + ./.github/scripts/backend-barretenberg-build.sh - name: Artifact uses: actions/upload-artifact@v4 with: @@ -409,8 +420,9 @@ jobs: path: /usr/src/noir/tooling/noir_js_backend_barretenberg/lib - name: Test + working-directory: /usr/src/noir run: | - /usr/src/noir/.github/scripts/backend-barretenberg-test.sh + ./.github/scripts/backend-barretenberg-test.sh build-noir_js: name: Build noirjs @@ -455,8 +467,9 @@ jobs: path: | /usr/src/noir/tooling/noir_js_types/lib - name: Build + working-directory: /usr/src/noir run: | - /usr/src/noir/.github/scripts/noir-js-build.sh + ./.github/scripts/noir-js-build.sh - name: Artifact uses: actions/upload-artifact@v4 with: @@ -521,8 +534,9 @@ jobs: path: /usr/src/noir/tooling/noir_js/lib - name: Test + working-directory: /usr/src/noir run: | - /usr/src/noir/.github/scripts/noir-js-test.sh + ./.github/scripts/noir-js-test.sh build-noir_codegen: name: Build noir codegen @@ -565,8 +579,9 @@ jobs: path: /usr/src/noir/tooling/noir_js/lib - name: Build + working-directory: /usr/src/noir run: | - /usr/src/noir/.github/scripts/noir-codegen-build.sh + ./.github/scripts/noir-codegen-build.sh - name: Artifact uses: actions/upload-artifact@v4 with: @@ -621,8 +636,9 @@ jobs: path: /usr/src/noir/tooling/noir_codegen/lib - name: Test + working-directory: /usr/src/noir run: | - /usr/src/noir/.github/scripts/noir-codegen-test.sh + ./.github/scripts/noir-codegen-test.sh test-integration: name: Integration test @@ -685,8 +701,9 @@ jobs: path: /usr/src/noir/tooling/noir_js_backend_barretenberg/lib - name: Test + working-directory: /usr/src/noir run: | - /usr/src/noir/.github/scripts/integration-test.sh + ./.github/scripts/integration-test.sh tests-end: name: End From 581081df7d41a41407f965675790fa16d680cf04 Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 10 Jan 2024 00:19:50 +0100 Subject: [PATCH 179/182] hello --- .github/workflows/docker-test-flow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 750cd58cc6c..7bd5790b142 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -3,7 +3,7 @@ name: Test Nargo and JS packages on: push: branches: - # - 'master' # + # - 'master' - 'cache-docker-artifacts' concurrency: From f9dea6faa49855f31c1e3068ec5383f6db860a7d Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 10 Jan 2024 00:35:19 +0100 Subject: [PATCH 180/182] test --- .github/scripts/noir-codegen-test.sh | 2 +- scripts/nargo_compile_noir_codegen_assert_lt.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/scripts/noir-codegen-test.sh b/.github/scripts/noir-codegen-test.sh index 10fa832501a..f86b62b447f 100755 --- a/.github/scripts/noir-codegen-test.sh +++ b/.github/scripts/noir-codegen-test.sh @@ -2,5 +2,5 @@ set -eu ./scripts/nargo_compile_noir_codegen_assert_lt.sh -rm -rf /usr/src/noir/tooling/noir_codegen/test/assert_lt/target/debug_assert_lt.json +# rm -rf /usr/src/noir/tooling/noir_codegen/test/test_lib/target/debug_assert_lt.json yarn workspace @noir-lang/noir_codegen test \ No newline at end of file diff --git a/scripts/nargo_compile_noir_codegen_assert_lt.sh b/scripts/nargo_compile_noir_codegen_assert_lt.sh index 858a16cf517..672a5d36411 100755 --- a/scripts/nargo_compile_noir_codegen_assert_lt.sh +++ b/scripts/nargo_compile_noir_codegen_assert_lt.sh @@ -1,4 +1,4 @@ #!/bin/bash -cd ./tooling/noir_codegen/test/assert_lt +cd ./tooling/noir_codegen/test/test_lib nargo compile \ No newline at end of file From 5b8da623569d160e5ec45a278a0f887ec6e61978 Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 10 Jan 2024 00:45:47 +0100 Subject: [PATCH 181/182] asdf --- .github/scripts/noir-codegen-test.sh | 2 -- scripts/nargo_compile_noir_codegen_assert_lt.sh | 4 ---- 2 files changed, 6 deletions(-) delete mode 100755 scripts/nargo_compile_noir_codegen_assert_lt.sh diff --git a/.github/scripts/noir-codegen-test.sh b/.github/scripts/noir-codegen-test.sh index f86b62b447f..6f603f65507 100755 --- a/.github/scripts/noir-codegen-test.sh +++ b/.github/scripts/noir-codegen-test.sh @@ -1,6 +1,4 @@ #!/bin/bash set -eu -./scripts/nargo_compile_noir_codegen_assert_lt.sh -# rm -rf /usr/src/noir/tooling/noir_codegen/test/test_lib/target/debug_assert_lt.json yarn workspace @noir-lang/noir_codegen test \ No newline at end of file diff --git a/scripts/nargo_compile_noir_codegen_assert_lt.sh b/scripts/nargo_compile_noir_codegen_assert_lt.sh deleted file mode 100755 index 672a5d36411..00000000000 --- a/scripts/nargo_compile_noir_codegen_assert_lt.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -cd ./tooling/noir_codegen/test/test_lib -nargo compile \ No newline at end of file From e938465df3656eb6d942c534154f85c8d9b823db Mon Sep 17 00:00:00 2001 From: Esau Date: Wed, 10 Jan 2024 01:52:37 +0100 Subject: [PATCH 182/182] add master --- .github/workflows/docker-test-flow.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 7bd5790b142..0277812f5ae 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -3,8 +3,7 @@ name: Test Nargo and JS packages on: push: branches: - # - 'master' - - 'cache-docker-artifacts' + - 'master' concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.ref || github.run_id }}