Cleanup

OffchainLabs · Sep 19, 2024 · 9abd6a7 · 9abd6a7
1 parent 5d0f4b4
commit 9abd6a7
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -16,6 +16,7 @@ env:
 jobs:
   load-e2e-files:
     name: "Load e2e files"
+    if: inputs.test_type.type != 'cctp'
     runs-on: ubuntu-latest
     outputs:
       matrix: ${{ steps.set-matrix.outputs.e2eFiles }}

diff --git a/.github/workflows/formatSpecfiles.js b/.github/workflows/formatSpecfiles.js
@@ -20,12 +20,13 @@ switch (testType) {
     break;
   }
   case "cctp": {
-    cctpFiles.forEach((spec) => {
-      tests.push({
-        ...spec,
-        type: 'cctp',
-      })
-    })
+    // Running CCTP tests in parallel cause nonce issues, we're running the two tests sequentially
+    test.push({
+      name: "cctp",
+      file: "tests/e2e/specs/**/*Cctp.cy.{js,jsx,ts,tsx}",
+      recordVideo: false,
+      type: "cctp",
+    });
     break;
   }
 }

diff --git a/.github/workflows/run-cctp-tests.yml b/.github/workflows/run-cctp-tests.yml
@@ -33,11 +33,19 @@ jobs:
       - uses: ./.github/actions/check-files
         id: check-files
 
+  anything:
+    name: "debug test"
+    runs-on: ubuntu-latest
+    steps:
+      - name: "step"
+        run: |
+          echo ${{ github.event.comment.body }}
+
   build:
     name: "Build"
     runs-on: ubuntu-latest
     needs: [check-files]
-    if: |
+    if: >
       (needs.check-files.outputs.run_tests == 'true' && ${{ !contains(github.event.pull_request.title, 'hotfix') }}) ||
       (contains(github.event.comment.html_url, '/pull/') && github.event.comment.body == '/run-cctp-tests')
     steps:

diff --git a/packages/arb-token-bridge-ui/synpress.cctp.config.ts b/packages/arb-token-bridge-ui/synpress.cctp.config.ts
@@ -45,9 +45,11 @@ export async function fundUsdc({
 
 const shouldRecordVideo = process.env.CYPRESS_RECORD_VIDEO === 'true'
 
-const tests = process.env.TEST_FILE
-  ? [process.env.TEST_FILE]
-  : specFiles.map(file => file.file)
+const tests =
+  process.env.TEST_FILE &&
+  specFiles.find(file => file.name === process.env.TEST_FILE)
+    ? [process.env.TEST_FILE]
+    : specFiles.map(file => file.file)
 
 const INFURA_KEY = process.env.NEXT_PUBLIC_INFURA_KEY
 if (typeof INFURA_KEY === 'undefined') {