chore(ci): Cache yarn and playwright dependencies in CI (#2697)

Co-authored-by: kevaundray <kevtheappdev@gmail.com>

.github/actions/install-playwright/action.yml

@@ -0,0 +1,24 @@
+name: Install Playwright
+description: Installs Playwright and its dependencies and caches them.
+
+runs:
+  using: composite
+  steps:
+    - name: Query playwright version
+      shell: bash
+      run: echo "PLAYWRIGHT_VERSION=$(yarn workspace @noir-lang/noirc_abi info @web/test-runner-playwright --json | jq .children.Version | tr -d '"')" >> $GITHUB_ENV
+
+    - name: Cache playwright binaries
+      uses: actions/cache@v3
+      id: playwright-cache
+      with:
+        path: |
+          ~/.cache/ms-playwright
+        key: ${{ runner.os }}-playwright-${{ env.PLAYWRIGHT_VERSION }}
+
+    - name: Install playwright deps
+      shell: bash
+      if: steps.playwright-cache.outputs.cache-hit != 'true'
+      run: |
+        npx playwright install
+        npx playwright install-deps

.github/actions/setup/action.yml

@@ -1,26 +1,16 @@
-name: Setup
-
-inputs:
-  working-directory:
-    default: ./
-    required: false
+name: Install Yarn dependencies
+description: Installs the workspace's yarn dependencies and caches them
 
 runs:
   using: composite
   steps:
-    - name: Install node
-      uses: actions/setup-node@v3
-      with:
-        node-version: 18.17.1
     - name: Cache
       uses: actions/cache@v3
       id: cache
       with:
         path: "**/node_modules"
         key: yarn-v1-${{ hashFiles('**/yarn.lock') }}
     - name: Install
-      run: |
-        cd ${{ inputs.working-directory }}
-        yarn --immutable
+      run: yarn --immutable
       shell: bash
       if: steps.cache.outputs.cache-hit != 'true'

.github/workflows/abi_wasm.yml

@@ -13,7 +13,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  noirc-abi-wasm-build:
+  build:
     runs-on: ubuntu-latest
     env:
       CACHED_PATH: /tmp/nix-cache
@@ -72,35 +72,29 @@ jobs:
           path: ${{ env.UPLOAD_PATH }}
           retention-days: 10
 
-      - name: Install workspace dependencies
-        run: |
-          yarn install --immutable
-
-      - name: Run node tests
-        run: |
-          yarn workspace @noir-lang/noirc_abi test
+  test:
+    runs-on: ubuntu-latest
+    needs: [build]
+  
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v3
 
-      - name: Cache playwright binaries
-        uses: actions/cache@v3
-        id: playwright-cache
+      - name: Download wasm package artifact
+        uses: actions/download-artifact@v3
         with:
-          path: |
-            ~/.cache/ms-playwright
-          key: ${{ runner.os }}-playwright-${{ env.PLAYWRIGHT_VERSION }}
+          name: noirc_abi_wasm
+          path: ./tooling/noirc_abi_wasm
+
+      - name: Install Yarn dependencies
+        uses: ./.github/actions/setup
 
-      - name: Query playwright version
-        working-directory: ./tooling/noirc_abi_wasm
-        run: echo "PLAYWRIGHT_VERSION=$(yarn info @web/test-runner-playwright --json | jq .children.Version)" >> $GITHUB_ENV
+      - name: Run node tests
+        run: yarn workspace @noir-lang/noirc_abi test
 
-      - name: Install playwright deps
-        if: steps.playwright-cache.outputs.cache-hit != 'true'
-        working-directory: ./tooling/noirc_abi_wasm
-        run: |
-          npx playwright install
-          npx playwright install-deps
+      - name: Install Playwright
+        uses: ./.github/actions/install-playwright
 
       - name: Run browser tests
-        working-directory: ./tooling/noirc_abi_wasm
-        run: |
-          yarn workspace @noir-lang/noirc_abi test:browser
+        run: yarn workspace @noir-lang/noirc_abi test:browser
 

.github/workflows/publish.yml

@@ -74,11 +74,14 @@ jobs:
           path: ./dist/*
           retention-days: 3
 
+      - name: Install Yarn dependencies
+        if: matrix.target == 'x86_64-apple-darwin'
+        uses: ./.github/actions/setup
+
       - name: Test built artifact
         if: matrix.target == 'x86_64-apple-darwin'
         run: |
           cp ./target/${{ matrix.target }}/release/nargo ~/.cargo/bin/          
-          yarn install --immutable
           yarn workspace release-tests test
 
       - name: Upload binaries to release tag
@@ -139,11 +142,14 @@ jobs:
           path: ./dist/*
           retention-days: 3
 
+      - name: Install Yarn dependencies
+        if: startsWith(matrix.target, 'x86_64-unknown-linux')
+        uses: ./.github/actions/setup
+
       - name: Test built artifact
         if: startsWith(matrix.target, 'x86_64-unknown-linux')
         run: |
           cp ./target/${{ matrix.target }}/release/nargo ~/.cargo/bin/
-          yarn install --immutable
           yarn workspace release-tests test
 
       - name: Upload binaries to release tag

.github/workflows/test-integration.yml

@@ -77,9 +77,11 @@ jobs:
           path: ${{ env.UPLOAD_PATH }}
           retention-days: 3
 
+      - name: Install Yarn dependencies
+        uses: ./.github/actions/setup
+
       - name: Setup `integration-tests`
         run: |
-          yarn install --immutable
           yarn workspace @noir-lang/noir-source-resolver build
 
       - name: Run `integration-tests`

.github/workflows/test-source-resolver.yml

@@ -16,8 +16,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Install dependencies
-        run: yarn install --immutable
+      - name: Install Yarn dependencies
+        uses: ./.github/actions/setup
 
       - name: Build @noir-lang/source-resolver
         run: yarn workspace @noir-lang/source-resolver build

.github/workflows/wasm.yml

@@ -132,16 +132,20 @@ jobs:
           chmod +x $nargo_binary
           $nargo_binary compile
 
+      - name: Install Yarn dependencies
+        uses: ./.github/actions/setup
+
+      - name: Install Playwright
+        uses: ./.github/actions/install-playwright
+
       - name: Install dependencies
         run: |
-          npx playwright install
-          npx playwright install-deps
           cp -r ./compiler/wasm/downloaded/nodejs ./compiler/wasm
           cp -r ./compiler/wasm/downloaded/web ./compiler/wasm
-          yarn install --immutable
           yarn workspace @noir-lang/source-resolver build
           
-      - name: Run tests
-        run: |
-          yarn workspace @noir-lang/noir_wasm test:browser
-          yarn workspace @noir-lang/noir_wasm test:node
+      - name: Run node tests
+        run: yarn workspace @noir-lang/noir_wasm test:node
+
+      - name: Run browser tests
+        run: yarn workspace @noir-lang/noir_wasm test:browser

compiler/integration-tests/package.json

@@ -18,6 +18,8 @@
     "@noir-lang/source-resolver": "workspace:*",
     "@web/dev-server-esbuild": "^0.3.6",
     "@web/test-runner": "^0.15.3",
-    "@web/test-runner-webdriver": "^0.7.0"
+    "@web/test-runner-webdriver": "^0.7.0",
+    "fflate": "^0.8.0",
+    "smol-toml": "^1.1.2"
   }
 }

compiler/wasm/.gitignore

@@ -1,8 +1 @@
-# Yarn
-.pnp.*
-.yarn/*
-!.yarn/patches
-!.yarn/plugins
-!.yarn/releases
-!.yarn/sdks
-!.yarn/versions
+noir-script/target

compiler/wasm/installPhase.sh

@@ -3,10 +3,6 @@ export self_path=$(dirname "$(readlink -f "$0")")
 
 mkdir -p $out
 cp $self_path/README.md $out/
+cp $self_path/package.json $out/
 cp -r $self_path/nodejs $out/
 cp -r $self_path/web $out/
-
-# The main package.json contains several keys which are incorrect/unwanted when distributing.
-cat $self_path/package.json \
-| jq 'del(.private, .devDependencies, .scripts, .packageManager)' \
-> $out/package.json

compiler/wasm/package.json

@@ -14,7 +14,6 @@
     "package.json"
   ],
   "sideEffects": false,
-  "packageManager": "yarn@3.5.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/noir-lang/noir.git"
@@ -29,6 +28,7 @@
     "@noir-lang/source-resolver": "workspace:*"
   },
   "devDependencies": {
+    "@esm-bundle/chai": "^4.3.4-fix.0",
     "@web/dev-server-esbuild": "^0.3.6",
     "@web/test-runner": "^0.15.3",
     "@web/test-runner-playwright": "^0.10.0",

compiler/wasm/web-test-runner.config.mjs

@@ -9,8 +9,8 @@ const reporter = process.env.CI ? summaryReporter() : defaultReporter();
 export default {
   browsers: [
     playwrightLauncher({ product: "chromium" }),
-    playwrightLauncher({ product: "webkit" }),
-    playwrightLauncher({ product: "firefox" }),
+    // playwrightLauncher({ product: "webkit" }),
+    // playwrightLauncher({ product: "firefox" }),
   ],
   plugins: [
     esbuildPlugin({

package.json

@@ -16,16 +16,13 @@
         "test:integration": "yarn workspace integration-tests test"
     },
     "devDependencies": {
-        "@esm-bundle/chai": "^4.3.4-fix.0",
         "@typescript-eslint/eslint-plugin": "^5.59.5",
         "@typescript-eslint/parser": "^5.59.5",
         "chai": "^4.3.7",
         "eslint": "^8.40.0",
         "eslint-plugin-prettier": "^4.2.1",
-        "fflate": "^0.8.0",
         "mocha": "^10.2.0",
         "prettier": "^2.8.8",
-        "smol-toml": "^1.1.2",
         "ts-node": "^10.9.1",
         "typescript": "^5.0.4"
     },

tooling/noirc_abi_wasm/installPhase.sh

@@ -3,10 +3,6 @@ export self_path=$(dirname "$(readlink -f "$0")")
 
 mkdir -p $out
 cp $self_path/README.md $out/
+cp $self_path/package.json $out/
 cp -r $self_path/nodejs $out/
 cp -r $self_path/web $out/
-
-# The main package.json contains several keys which are incorrect/unwanted when distributing.
-cat $self_path/package.json \
-| jq 'del(.private, .devDependencies, .scripts, .packageManager)' \
-> $out/package.json

tooling/noirc_abi_wasm/package.json

@@ -21,14 +21,14 @@
     "type": "git",
     "url": "https://github.com/noir-lang/noir.git"
   },
-  "packageManager": "yarn@3.5.1",
   "scripts": {
     "build": "bash ./build.sh",
     "test": "env TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\" }' mocha",
     "test:browser": "web-test-runner",
     "lint": "NODE_NO_WARNINGS=1 eslint . --ext .ts --ignore-path ./.eslintignore  --max-warnings 0"
   },
   "devDependencies": {
+    "@esm-bundle/chai": "^4.3.4-fix.0",
     "@web/dev-server-esbuild": "^0.3.6",
     "@web/test-runner": "^0.15.3",
     "@web/test-runner-playwright": "^0.10.0",

tooling/noirc_abi_wasm/test/browser/abi_encode.test.ts

@@ -1,5 +1,9 @@
 import { expect } from "@esm-bundle/chai";
-import initNoirAbi, { abiEncode, abiDecode, WitnessMap } from "@noir-lang/noirc_abi";
+import initNoirAbi, {
+  abiEncode,
+  abiDecode,
+  WitnessMap,
+} from "@noir-lang/noirc_abi";
 import { DecodedInputs } from "../types";
 
 beforeEach(async () => {
@@ -12,7 +16,6 @@ it("recovers original inputs when abi encoding and decoding", async () => {
   const initial_witness: WitnessMap = abiEncode(abi, inputs, null);
   const decoded_inputs: DecodedInputs = abiDecode(abi, initial_witness);
 
-
   expect(BigInt(decoded_inputs.inputs.foo)).to.be.equal(BigInt(inputs.foo));
   expect(BigInt(decoded_inputs.inputs.bar[0])).to.be.equal(
     BigInt(inputs.bar[0])
@@ -21,4 +24,4 @@ it("recovers original inputs when abi encoding and decoding", async () => {
     BigInt(inputs.bar[1])
   );
   expect(decoded_inputs.return_value).to.be.null;
-});
+});