From 5323f9c7f5fb24237fbb0feab1717311c99058e0 Mon Sep 17 00:00:00 2001 From: Artur Sapek Date: Thu, 27 Jun 2024 11:58:06 -0400 Subject: [PATCH 1/8] ci fix attempt --- .github/workflows/build.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b0ec5de10..94a52db57 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,6 +19,7 @@ jobs: with: node-version: 20 cache: "npm" + - run: cd wormhole-connect - run: npm ci - run: npm run lint:ci test: @@ -30,9 +31,9 @@ jobs: with: node-version: 20 cache: "npm" + - run: cd wormhole-connect - run: npm ci - - run: npm run build -w sdk - - run: npm test -w wormhole-connect + - run: npm test env: REACT_APP_SOLANA_RPC: ${{ vars.REACT_APP_SOLANA_RPC }} @@ -54,9 +55,8 @@ jobs: with: node-version: 20 cache: "npm" - - run: npm ci - - run: npm run build -w sdk - - run: cd wormhole-connect && npx tsx scripts/checkForeignAssetsConfig.ts + - run: cd wormhole-connect + - run: npx tsx scripts/checkForeignAssetsConfig.ts build-hosted: runs-on: ubuntu-latest @@ -66,6 +66,7 @@ jobs: with: node-version: 20 cache: "npm" + - run: cd wormhole-connect - run: npm ci - run: npm run build:hosted build-library: @@ -77,5 +78,6 @@ jobs: with: node-version: 20 cache: "npm" + - run: cd wormhole-connect - run: npm ci - run: npm run build:lib From 3dc59f509f399138e79eba187222e8453349e3be Mon Sep 17 00:00:00 2001 From: Artur Sapek Date: Thu, 27 Jun 2024 12:00:10 -0400 Subject: [PATCH 2/8] cache-dependency-path --- .github/workflows/build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 94a52db57..0c8684c07 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,6 +19,7 @@ jobs: with: node-version: 20 cache: "npm" + cache-dependency-path: "wormhole-connect/package-lock.json" - run: cd wormhole-connect - run: npm ci - run: npm run lint:ci @@ -31,6 +32,7 @@ jobs: with: node-version: 20 cache: "npm" + cache-dependency-path: "wormhole-connect/package-lock.json" - run: cd wormhole-connect - run: npm ci - run: npm test @@ -55,6 +57,7 @@ jobs: with: node-version: 20 cache: "npm" + cache-dependency-path: "wormhole-connect/package-lock.json" - run: cd wormhole-connect - run: npx tsx scripts/checkForeignAssetsConfig.ts build-hosted: @@ -66,6 +69,7 @@ jobs: with: node-version: 20 cache: "npm" + cache-dependency-path: "wormhole-connect/package-lock.json" - run: cd wormhole-connect - run: npm ci - run: npm run build:hosted @@ -78,6 +82,7 @@ jobs: with: node-version: 20 cache: "npm" + cache-dependency-path: "wormhole-connect/package-lock.json" - run: cd wormhole-connect - run: npm ci - run: npm run build:lib From e10f6d4d7094bbf63a54f6a0bd9a5a3bb8b513bc Mon Sep 17 00:00:00 2001 From: Artur Sapek Date: Thu, 27 Jun 2024 12:04:22 -0400 Subject: [PATCH 3/8] pls --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0c8684c07..43558dce1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,6 +21,7 @@ jobs: cache: "npm" cache-dependency-path: "wormhole-connect/package-lock.json" - run: cd wormhole-connect + - run: pwd; ls; - run: npm ci - run: npm run lint:ci test: From f3cc1fb4d74fa84c962e58e30617fffdac6b3846 Mon Sep 17 00:00:00 2001 From: Artur Sapek Date: Thu, 27 Jun 2024 12:05:07 -0400 Subject: [PATCH 4/8] add back npm ci --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 43558dce1..300dd69a1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -60,6 +60,7 @@ jobs: cache: "npm" cache-dependency-path: "wormhole-connect/package-lock.json" - run: cd wormhole-connect + - run: npm ci - run: npx tsx scripts/checkForeignAssetsConfig.ts build-hosted: runs-on: ubuntu-latest From 9a61511616e29e752f45f0c4ed47c720328e52ff Mon Sep 17 00:00:00 2001 From: Artur Sapek Date: Thu, 27 Jun 2024 12:07:06 -0400 Subject: [PATCH 5/8] smh --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 300dd69a1..1dd00a839 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: node-version: 20 cache: "npm" cache-dependency-path: "wormhole-connect/package-lock.json" - - run: cd wormhole-connect + - run: cd wormhole-connect/wormhole-connect - run: pwd; ls; - run: npm ci - run: npm run lint:ci @@ -34,7 +34,7 @@ jobs: node-version: 20 cache: "npm" cache-dependency-path: "wormhole-connect/package-lock.json" - - run: cd wormhole-connect + - run: cd wormhole-connect/wormhole-connect - run: npm ci - run: npm test env: @@ -59,7 +59,7 @@ jobs: node-version: 20 cache: "npm" cache-dependency-path: "wormhole-connect/package-lock.json" - - run: cd wormhole-connect + - run: cd wormhole-connect/wormhole-connect - run: npm ci - run: npx tsx scripts/checkForeignAssetsConfig.ts build-hosted: @@ -72,7 +72,7 @@ jobs: node-version: 20 cache: "npm" cache-dependency-path: "wormhole-connect/package-lock.json" - - run: cd wormhole-connect + - run: cd wormhole-connect/wormhole-connect - run: npm ci - run: npm run build:hosted build-library: @@ -85,6 +85,6 @@ jobs: node-version: 20 cache: "npm" cache-dependency-path: "wormhole-connect/package-lock.json" - - run: cd wormhole-connect + - run: cd wormhole-connect/wormhole-connect - run: npm ci - run: npm run build:lib From b066ef2eacb8fdc17ac8ac1d54bf51718be72ff4 Mon Sep 17 00:00:00 2001 From: Artur Sapek Date: Thu, 27 Jun 2024 12:10:46 -0400 Subject: [PATCH 6/8] do you think this is a motherfucking game? --- .github/workflows/build.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1dd00a839..2539d03db 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,8 @@ jobs: node-version: 20 cache: "npm" cache-dependency-path: "wormhole-connect/package-lock.json" - - run: cd wormhole-connect/wormhole-connect + - run: cd wormhole-connect + - run: cd wormhole-connect - run: pwd; ls; - run: npm ci - run: npm run lint:ci @@ -34,7 +35,8 @@ jobs: node-version: 20 cache: "npm" cache-dependency-path: "wormhole-connect/package-lock.json" - - run: cd wormhole-connect/wormhole-connect + - run: cd wormhole-connect + - run: cd wormhole-connect - run: npm ci - run: npm test env: @@ -59,7 +61,8 @@ jobs: node-version: 20 cache: "npm" cache-dependency-path: "wormhole-connect/package-lock.json" - - run: cd wormhole-connect/wormhole-connect + - run: cd wormhole-connect + - run: cd wormhole-connect - run: npm ci - run: npx tsx scripts/checkForeignAssetsConfig.ts build-hosted: @@ -72,7 +75,8 @@ jobs: node-version: 20 cache: "npm" cache-dependency-path: "wormhole-connect/package-lock.json" - - run: cd wormhole-connect/wormhole-connect + - run: cd wormhole-connect + - run: cd wormhole-connect - run: npm ci - run: npm run build:hosted build-library: @@ -85,6 +89,7 @@ jobs: node-version: 20 cache: "npm" cache-dependency-path: "wormhole-connect/package-lock.json" - - run: cd wormhole-connect/wormhole-connect + - run: cd wormhole-connect + - run: cd wormhole-connect - run: npm ci - run: npm run build:lib From ce925007bda032cc91c2d2666d63a146dcea34d1 Mon Sep 17 00:00:00 2001 From: Artur Sapek Date: Thu, 27 Jun 2024 12:14:22 -0400 Subject: [PATCH 7/8] working dir --- .github/workflows/build.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2539d03db..666d2f3d5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,11 +20,10 @@ jobs: node-version: 20 cache: "npm" cache-dependency-path: "wormhole-connect/package-lock.json" - - run: cd wormhole-connect - - run: cd wormhole-connect - - run: pwd; ls; - run: npm ci + working-directory: wormhole-connect - run: npm run lint:ci + working-directory: wormhole-connect test: runs-on: ubuntu-latest @@ -35,10 +34,10 @@ jobs: node-version: 20 cache: "npm" cache-dependency-path: "wormhole-connect/package-lock.json" - - run: cd wormhole-connect - - run: cd wormhole-connect - run: npm ci + working-directory: wormhole-connect - run: npm test + working-directory: wormhole-connect env: REACT_APP_SOLANA_RPC: ${{ vars.REACT_APP_SOLANA_RPC }} @@ -49,7 +48,8 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - name: Run script - run: cd wormhole-connect #&& npm i prettier && npm run checksdn + run: echo hi #npm i prettier && npm run checksdn + working-directory: wormhole-connect check-token-list: runs-on: ubuntu-latest @@ -61,10 +61,10 @@ jobs: node-version: 20 cache: "npm" cache-dependency-path: "wormhole-connect/package-lock.json" - - run: cd wormhole-connect - - run: cd wormhole-connect - run: npm ci + working-directory: wormhole-connect - run: npx tsx scripts/checkForeignAssetsConfig.ts + working-directory: wormhole-connect build-hosted: runs-on: ubuntu-latest @@ -75,10 +75,10 @@ jobs: node-version: 20 cache: "npm" cache-dependency-path: "wormhole-connect/package-lock.json" - - run: cd wormhole-connect - - run: cd wormhole-connect - run: npm ci + working-directory: wormhole-connect - run: npm run build:hosted + working-directory: wormhole-connect build-library: runs-on: ubuntu-latest @@ -89,7 +89,7 @@ jobs: node-version: 20 cache: "npm" cache-dependency-path: "wormhole-connect/package-lock.json" - - run: cd wormhole-connect - - run: cd wormhole-connect - run: npm ci + working-directory: wormhole-connect - run: npm run build:lib + working-directory: wormhole-connect From 01c9fc0746bae3ee8e8080b48e353c5d2fa5cdef Mon Sep 17 00:00:00 2001 From: Artur Sapek Date: Thu, 27 Jun 2024 12:18:01 -0400 Subject: [PATCH 8/8] byebye --- wormhole-connect/tests/ci/ntt.test.ts | 29 --------------------------- 1 file changed, 29 deletions(-) delete mode 100644 wormhole-connect/tests/ci/ntt.test.ts diff --git a/wormhole-connect/tests/ci/ntt.test.ts b/wormhole-connect/tests/ci/ntt.test.ts deleted file mode 100644 index a17f29069..000000000 --- a/wormhole-connect/tests/ci/ntt.test.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { describe, expect, test } from 'vitest'; -import { abiVersionMatches } from 'routes/ntt/utils'; - -describe('NTT ABI version matching', () => { - test('should return true if major versions match and target minor version is greater, ignoring patch version', () => { - expect(abiVersionMatches('1.1.0', '1.0.0')).toBeTruthy(); - }); - - test('should return true if major, minor, and patch versions match exactly', () => { - expect(abiVersionMatches('1.0.0', '1.0.0')).toBeTruthy(); - }); - - test('should return false if major versions do not match, ignoring minor and patch versions', () => { - expect(abiVersionMatches('1.0.0', '2.0.0')).toBeFalsy(); - }); - - test('should return false if major versions match but target minor version is less, ignoring patch version', () => { - expect(abiVersionMatches('1.0.0', '1.1.0')).toBeFalsy(); - }); - - test('should handle versions with more than one digit correctly, ignoring patch version', () => { - expect(abiVersionMatches('10.20.0', '10.15.5')).toBeTruthy(); - }); - - test('should return false if any version is not in correct format', () => { - expect(abiVersionMatches('1..0.0', '2.0.0')).toBeFalsy(); - expect(abiVersionMatches('1.0.0', '2..0.0')).toBeFalsy(); - }); -});