chore: cleanup CI workflows to be more consistent (#3366)

noir-lang · Oct 30, 2023 · dfb563d · dfb563d
1 parent 6b74d31
commit dfb563d
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 89 deletions.
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
@@ -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_wasm.yml b/.github/workflows/test-noir_wasm.yml
@@ -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/cspell.json b/cspell.json
@@ -15,6 +15,7 @@
         "bitand",
         "blackbox",
         "brillig",
+        "cachix",
         "callsite",
         "callsites",
         "canonicalize",