Merge branch 'master' into zpedro/docs_release_please

noir-lang · Oct 30, 2023 · ddcc221 · ddcc221
2 parents 61f6ad5 + 86f4ccc
commit ddcc221
Show file tree

Hide file tree

Showing 369 changed files with 1,067 additions and 1,078 deletions.
diff --git a/.github/workflows/auto-pr-rebuild-script.yml b/.github/workflows/auto-pr-rebuild-script.yml
@@ -16,20 +16,21 @@ jobs:
     steps:
       - name: Check if artifacts should be published
         id: check
-        run: |
-          if [ ${{ github.ref_name }} == "master" ]; then
-            # Always publish on master
-            echo "publish=true" >> "$GITHUB_OUTPUT"
-          else
-            # Only publish on PRs if label is set
-            HAS_ARTIFACT_LABEL=$(gh pr view $PR --repo $REPO_URL --json labels | jq '.labels | any(.name == "publish-acir")')
-            echo "publish=$HAS_ARTIFACT_LABEL" >> "$GITHUB_OUTPUT"
-          fi
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const { REF_NAME } = process.env;
+            if (REF_NAME == "master") {
+              return true;
+            }
+
+            const labels = context.payload.pull_request.labels.map(label => label.name);
+            return labels.includes('publish-acir');
+          result-encoding: string
         env:
-          GH_TOKEN: ${{ github.token }}
-          PR: ${{ github.event.pull_request.number }}
-          REPO_URL: ${{ github.repositoryUrl }}
-
+          REF_NAME: ${{ github.ref_name }}
+
   build-nargo:
     name: Build nargo binary
     runs-on: ubuntu-22.04
@@ -44,7 +45,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup toolchain
-        uses: dtolnay/rust-toolchain@1.66.0
+        uses: dtolnay/rust-toolchain@1.71.1
 
       - uses: Swatinem/rust-cache@v2
         with:

diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml
@@ -32,7 +32,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup toolchain
-        uses: dtolnay/rust-toolchain@1.66.0
+        uses: dtolnay/rust-toolchain@1.71.1
         with:
           targets: ${{ matrix.target }}
           components: clippy, rustfmt

diff --git a/.github/workflows/gates_report.yml b/.github/workflows/gates_report.yml
@@ -18,7 +18,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup toolchain
-        uses: dtolnay/rust-toolchain@1.66.0
+        uses: dtolnay/rust-toolchain@1.71.1
 
       - uses: Swatinem/rust-cache@v2
         with:

diff --git a/.github/workflows/publish-acvm.yml b/.github/workflows/publish-acvm.yml
@@ -18,9 +18,7 @@ jobs:
           ref: ${{ inputs.acvm-ref }}
 
       - name: Setup toolchain
-        uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: 1.66.0
+        uses: dtolnay/[email protected]
 
       # These steps are in a specific order so crate dependencies are updated first
       - name: Publish acir_field

diff --git a/.github/workflows/publish-nargo.yml b/.github/workflows/publish-nargo.yml
@@ -45,7 +45,7 @@ jobs:
           echo "MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx$(sw_vers -productVersion) --show-sdk-platform-version)" >> $GITHUB_ENV
 
       - name: Setup toolchain
-        uses: dtolnay/rust-toolchain@1.66.0
+        uses: dtolnay/rust-toolchain@1.71.1
         with:
           targets: ${{ matrix.target }}
 
@@ -128,7 +128,7 @@ jobs:
           ref: ${{ inputs.tag || env.GITHUB_REF }}
 
       - name: Setup toolchain
-        uses: dtolnay/rust-toolchain@1.66.0
+        uses: dtolnay/rust-toolchain@1.71.1
         with:
           targets: ${{ matrix.target }}
 
@@ -177,6 +177,7 @@ jobs:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ./nargo-${{ matrix.target }}.tar.gz
           asset_name: nargo-${{ matrix.target }}.tar.gz
+          prerelease: true
           overwrite: true
           tag: ${{ inputs.tag || 'nightly' }} # This will fail if `inputs.tag` is not a tag (e.g. testing a branch)
 
@@ -198,4 +199,4 @@ jobs:
           overwrite: true
           tag: ${{ format('{0}-{1}', 'nightly', steps.date.outputs.date) }}
 
-
+
diff --git a/.github/workflows/test-abi_wasm.yml b/.github/workflows/test-abi_wasm.yml
@@ -15,23 +15,17 @@ concurrency:
 jobs:
   build:
     runs-on: ubuntu-latest
-    env:
-      CACHED_PATH: /tmp/nix-cache
 
     steps:
       - name: Checkout sources
         uses: actions/checkout@v3
 
       - name: Setup Nix
-        uses: cachix/install-nix-action@v22
+        uses: ./.github/actions/nix
         with:
-          nix_path: nixpkgs=channel:nixos-23.05
-          github_access_token: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: cachix/cachix-action@v12
-        with:
-          name: barretenberg
-          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          nix-cache-name: ${{ vars.NIX_CACHE_NAME }}
+          cachix-auth-token: ${{ secrets.CACHIXAUTHTOKEN }}
 
       - name: Build noirc_abi_wasm
         run: |

diff --git a/.github/workflows/test-acvm-js.yml b/.github/workflows/test-acvm-js.yml
@@ -19,15 +19,12 @@ jobs:
       - name: Checkout sources
         uses: actions/checkout@v4
 
-      - uses: cachix/install-nix-action@v20
+      - name: Setup Nix
+        uses: ./.github/actions/nix
         with:
-          nix_path: nixpkgs=channel:nixos-22.11
-          github_access_token: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: cachix/cachix-action@v12
-        with:
-          name: barretenberg
-          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          nix-cache-name: ${{ vars.NIX_CACHE_NAME }}
+          cachix-auth-token: ${{ secrets.CACHIXAUTHTOKEN }}
 
       - name: Build acvm-js
         run: |

diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml
@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup toolchain
-        uses: dtolnay/rust-toolchain@1.66.0
+        uses: dtolnay/rust-toolchain@1.71.1
 
       - uses: Swatinem/rust-cache@v2
         with:
@@ -45,40 +45,22 @@ jobs:
 
   build-wasm:
     runs-on: ubuntu-latest
-    env:
-      CACHED_PATH: /tmp/nix-cache
 
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
 
       - name: Setup Nix
-        uses: cachix/install-nix-action@v22
+        uses: ./.github/actions/nix
         with:
-          nix_path: nixpkgs=channel:nixos-23.05
-          github_access_token: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: cachix/cachix-action@v12
-        with:
-          name: barretenberg
-          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          nix-cache-name: ${{ vars.NIX_CACHE_NAME }}
+          cachix-auth-token: ${{ secrets.CACHIXAUTHTOKEN }}
 
       - name: Build wasm package
         run: |
           nix build -L .#noir_wasm
 
-      - name: Export cache from nix store
-        if: ${{ steps.cache.outputs.cache-hit != 'true' && github.event_name != 'merge_group' }}
-        run: |
-          nix copy --to "file://${{ env.CACHED_PATH }}?compression=zstd&parallel-compression=true" .#noir-wasm-cargo-artifacts
-
-      - uses: actions/cache/save@v3
-        # Don't create cache entries for the merge queue.
-        if: ${{ steps.cache.outputs.cache-hit != 'true' && github.event_name != 'merge_group' }}
-        with:
-          path: ${{ env.CACHED_PATH }}
-          key: ${{ steps.cache.outputs.cache-primary-key }}
-
       - name: Dereference symlink
         run: echo "UPLOAD_PATH=$(readlink -f ./result/noir_wasm)" >> $GITHUB_ENV
 
@@ -91,59 +73,24 @@ jobs:
 
   build-noirc:
     runs-on: ubuntu-latest
-    env:
-      CACHED_PATH: /tmp/nix-cache
 
     steps:
       - name: Checkout sources
         uses: actions/checkout@v3
 
       - name: Setup Nix
-        uses: cachix/install-nix-action@v22
+        uses: ./.github/actions/nix
         with:
-          nix_path: nixpkgs=channel:nixos-23.05
-          github_access_token: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: cachix/cachix-action@v12
-        with:
-          name: barretenberg
-          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
-
-      - name: Restore nix store cache
-        uses: actions/cache/restore@v3
-        id: cache
-        with:
-          path: ${{ env.CACHED_PATH }}
-          key: ${{ runner.os }}-flake-abi-wasm-${{ hashFiles('*.lock') }}
-
-      # Based on https://github.com/marigold-dev/deku/blob/b5016f0cf4bf6ac48db9111b70dd7fb49b969dfd/.github/workflows/build.yml#L26
-      - name: Copy cache into nix store
-        if: steps.cache.outputs.cache-hit == 'true'
-        # We don't check the signature because we're the one that created the cache
-        run: |
-          for narinfo in ${{ env.CACHED_PATH }}/*.narinfo; do
-            path=$(head -n 1 "$narinfo" | awk '{print $2}')
-            nix copy --no-check-sigs --from "file://${{ env.CACHED_PATH }}" "$path"
-          done
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          nix-cache-name: ${{ vars.NIX_CACHE_NAME }}
+          cachix-auth-token: ${{ secrets.CACHIXAUTHTOKEN }}
 
       - name: Build noirc_abi_wasm
         run: |
           nix build -L .#noirc_abi_wasm
           cp -r ./result/noirc_abi_wasm/nodejs ./tooling/noirc_abi_wasm
           cp -r ./result/noirc_abi_wasm/web ./tooling/noirc_abi_wasm
 
-      - name: Export cache from nix store
-        if: ${{ steps.cache.outputs.cache-hit != 'true' && github.event_name != 'merge_group' }}
-        run: |
-          nix copy --to "file://${{ env.CACHED_PATH }}?compression=zstd&parallel-compression=true" .#noirc-abi-wasm-cargo-artifacts
-
-      - uses: actions/cache/save@v3
-        # Don't create cache entries for the merge queue.
-        if: ${{ steps.cache.outputs.cache-hit != 'true' && github.event_name != 'merge_group' }}
-        with:
-          path: ${{ env.CACHED_PATH }}
-          key: ${{ steps.cache.outputs.cache-primary-key }}
-
       - name: Dereference symlink
         run: echo "UPLOAD_PATH=$(readlink -f ./result/noirc_abi_wasm)" >> $GITHUB_ENV
 

diff --git a/.github/workflows/test-noir-js.yml b/.github/workflows/test-noir-js.yml
@@ -21,7 +21,7 @@ jobs:
         uses: ./.github/actions/setup
 
       - name: Setup toolchain
-        uses: dtolnay/rust-toolchain@1.66.0
+        uses: dtolnay/rust-toolchain@1.71.1
         with:
           targets: wasm32-unknown-unknown
 

diff --git a/.github/workflows/test-noir_wasm.yml b/.github/workflows/test-noir_wasm.yml
@@ -23,7 +23,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup toolchain
-        uses: dtolnay/rust-toolchain@1.66.0
+        uses: dtolnay/rust-toolchain@1.71.1
 
       - uses: Swatinem/rust-cache@v2
         with:
@@ -49,23 +49,17 @@ jobs:
 
   build-wasm:
     runs-on: ubuntu-latest
-    env:
-      CACHED_PATH: /tmp/nix-cache
 
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
 
       - name: Setup Nix
-        uses: cachix/install-nix-action@v22
+        uses: ./.github/actions/nix
         with:
-          nix_path: nixpkgs=channel:nixos-23.05
-          github_access_token: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: cachix/cachix-action@v12
-        with:
-          name: barretenberg
-          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          nix-cache-name: ${{ vars.NIX_CACHE_NAME }}
+          cachix-auth-token: ${{ secrets.CACHIXAUTHTOKEN }}
 
       - name: Build wasm package
         run: |

diff --git a/.github/workflows/test-rust-workspace.yml b/.github/workflows/test-rust-workspace.yml
@@ -31,7 +31,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup toolchain
-        uses: dtolnay/rust-toolchain@1.66.0
+        uses: dtolnay/rust-toolchain@1.71.1
         with:
           targets: ${{ matrix.target }}
 

diff --git a/Cargo.lock b/Cargo.lock