chore(ci): Use large mac runner for tests (#1803)

* chore(ci): Use large mac runner for tests

* chore(ci): Run tests on pull_request and merge_group events

* chore(ci): Timeout tests in 30 minutes

* chore(ci): Only run wasm workflow on pull_request and merge_queue events

* chore(nix): Avoid building bb wasm for the noir_wasm target

* chore(ci): Switch to merge_group event

* chore(ci): Align install-nix-action versions

.github/workflows/pull-request.yml

@@ -1,11 +1,7 @@
 name: Pull Request
 
 on:
-  # merge_group:
-  # The `merge_group` event is currently broken (Feb 9th) so we use `push` and scope the branches
-  push:
-    branches:
-      - gh-readonly-queue/master/*
+  merge_group:
   pull_request_target:
     types:
       - opened

.github/workflows/test.yml

@@ -1,6 +1,8 @@
 name: Test
 
-on: [push, pull_request]
+on:
+  pull_request:
+  merge_group:
 
 # This will cancel previous runs when a branch or PR is updated
 concurrency:
@@ -11,6 +13,7 @@ jobs:
   test:
     name: Test on ${{ matrix.os }}
     runs-on: ${{ matrix.runner }}
+    timeout-minutes: 30
 
     strategy:
       fail-fast: false
@@ -20,7 +23,7 @@ jobs:
             runner: ubuntu-large
             target: x86_64-linux
           - os: mac
-            runner: macos-latest
+            runner: macos-latest-xl
             target: x86_64-darwin
 
     steps:

.github/workflows/wasm.yml

@@ -1,6 +1,8 @@
 name: Wasm
 
-on: [push, pull_request]
+on:
+  pull_request:
+  merge_group:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.ref || github.run_id }}
@@ -15,7 +17,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Nix
-        uses: cachix/install-nix-action@v20
+        uses: cachix/install-nix-action@v22
         with:
           nix_path: nixpkgs=channel:nixos-22.11
           github_access_token: ${{ secrets.GITHUB_TOKEN }}

flake.nix

@@ -170,7 +170,7 @@
       };
 
       # Combine the environmnet with cargo args needed to build wasm package
-      noirWasmArgs = wasmEnvironment // {
+      noirWasmArgs = sharedEnvironment // sharedArgs // {
         pname = "noir_wasm";
 
         src = ./.;