Merge branch 'master' into ad/acir-tests-bb

AztecProtocol · May 22, 2024 · 5804d24 · 5804d24
2 parents c45e319 + 83888f5
commit 5804d24
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/boxes/boxes/react/playwright.config.ts b/boxes/boxes/react/playwright.config.ts
@@ -18,15 +18,15 @@ export default defineConfig({
   },
   projects: [
     {
-      name: 'react-chromium',
+      name: 'chromium',
       use: { ...devices['Desktop Chrome'] },
     },
     {
-      name: 'react-firefox',
+      name: 'firefox',
       use: { ...devices['Desktop Firefox'] },
     },
     {
-      name: 'react-webkit',
+      name: 'webkit',
       use: { ...devices['Desktop Safari'] },
     },
   ],

diff --git a/boxes/boxes/vanilla/playwright.config.ts b/boxes/boxes/vanilla/playwright.config.ts
@@ -18,15 +18,15 @@ export default defineConfig({
   },
   projects: [
     {
-      name: 'vanilla-chromium',
+      name: 'chromium',
       use: { ...devices['Desktop Chrome'] },
     },
     {
-      name: 'vanilla-firefox',
+      name: 'firefox',
       use: { ...devices['Desktop Firefox'] },
     },
     {
-      name: 'vanilla-webkit',
+      name: 'webkit',
       use: { ...devices['Desktop Safari'] },
     },
   ],

diff --git a/boxes/docker-compose.yml b/boxes/docker-compose.yml
@@ -22,7 +22,7 @@ services:
     image: aztecprotocol/boxes:${AZTEC_DOCKER_TAG:-latest}
     entrypoint: >
       sh -c '
-        yarn workspace @aztec/$BOX test --project=$BOX-$BROWSER
+        yarn workspace @aztec/$BOX test --project=$BROWSER
       '
     environment:
       DEBUG: "aztec:*"

diff --git a/yarn-project/end-to-end/Earthfile b/yarn-project/end-to-end/Earthfile
@@ -163,8 +163,9 @@ uniswap-trade-on-l1-from-l2:
 integration-l1-publisher:
   DO +E2E_COMPOSE_TEST --test=integration_l1_publisher.test.ts
 
-integration-proof-verification:
-  DO +E2E_COMPOSE_TEST --compose_file=./scripts/docker-compose-no-sandbox.yml --test=integration_proof_verification.test.ts
+# Disabled, TODO https://github.com/AztecProtocol/aztec-packages/issues/6624
+# integration-proof-verification:
+#  DO +E2E_COMPOSE_TEST --compose_file=./scripts/docker-compose-no-sandbox.yml --test=integration_proof_verification.test.ts
 
 e2e-browser:
   DO +E2E_COMPOSE_TEST --test=e2e_aztec_js_browser.test.ts