feat(wip): ci fixes

hyperledger-cacti · Feb 13, 2024 · f7b553d · f7b553d
1 parent c50d2f2
commit f7b553d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -407,11 +407,11 @@ jobs:
           tool: 'benchmarkjs'
           output-file-path: .tmp/benchmark-results/cmd-api-server/run-cmd-api-server-benchmark.ts.log
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          
+
           # Only push the benchmark results to gh-pages website if we are running on the main branch
           # We do not want to clutter the benchmark results with intermediate results from PRs that could be drafts
           auto-push: ${{ github.ref == 'refs/heads/main' }}
-          
+
           # Show alert with commit comment on detecting possible performance regression
           alert-threshold: '5%'
           comment-on-alert: true
@@ -1086,7 +1086,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }}
       - run: npm run configure
-      - run: yarn ts-node ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/deploy-cc-from-javascript-source.test.ts
+      - run: yarn tsx ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/deploy-cc-from-javascript-source.test.ts
 
   plugin-ledger-connector-fabric-2:
     continue-on-error: false
@@ -1119,7 +1119,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }}
       - run: npm run configure
-      - run: yarn ts-node ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/deploy-cc-from-typescript-source.test.ts
+      - run: yarn tsx ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/deploy-cc-from-typescript-source.test.ts
 
   plugin-ledger-connector-fabric-3:
     needs:
@@ -1152,7 +1152,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }}
       - run: npm run configure
-      - run: yarn ts-node ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/deploy-lock-asset.test.ts
+      - run: yarn tsx ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/deploy-lock-asset.test.ts
 
   plugin-ledger-connector-fabric-4:
     continue-on-error: false
@@ -1185,7 +1185,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }}
       - run: npm run configure
-      - run: yarn ts-node ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/openapi/openapi-validation.test.ts
+      - run: yarn tsx ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/openapi/openapi-validation.test.ts
 
   plugin-ledger-connector-fabric-5:
     continue-on-error: false
@@ -1218,7 +1218,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }}
       - run: npm run configure
-      - run: yarn ts-node ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/openapi/openapi-validation-go.test.ts
+      - run: yarn tsx ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/openapi/openapi-validation-go.test.ts
 
   plugin-ledger-connector-fabric-6:
     continue-on-error: false
@@ -1251,7 +1251,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }}
       - run: npm run configure
-      - run: yarn ts-node ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/unit/identity-internal-crypto-utils.test.ts
+      - run: yarn tsx ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/unit/identity-internal-crypto-utils.test.ts
 
   plugin-ledger-connector-fabric-7:
     continue-on-error: false
@@ -1284,7 +1284,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }}
       - run: npm run configure
-      - run: yarn ts-node ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/identity-client.test.ts
+      - run: yarn tsx ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/identity-client.test.ts
 
   plugin-ledger-connector-fabric-8:
     continue-on-error: false
@@ -1317,7 +1317,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }}
       - run: npm run configure
-      - run: yarn ts-node ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/run-transaction-with-identities.test.ts
+      - run: yarn tsx ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/run-transaction-with-identities.test.ts
 
   plugin-ledger-connector-fabric-9:
     continue-on-error: false
@@ -1350,7 +1350,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }}
       - run: npm run configure
-      - run: yarn ts-node ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/obtain-profiles.test.ts
+      - run: yarn tsx ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/obtain-profiles.test.ts
 
   plugin-ledger-connector-fabric-10:
     needs:
@@ -1383,7 +1383,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }}
       - run: npm run configure
-      - run: yarn ts-node ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/deploy-cc-from-golang-source.test.ts
+      - run: yarn tsx ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/deploy-cc-from-golang-source.test.ts
 
   plugin-ledger-connector-fabric-11:
     continue-on-error: false
@@ -1416,7 +1416,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }}
       - run: npm run configure
-      - run: yarn ts-node ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/add-orgs.test.ts
+      - run: yarn tsx ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/add-orgs.test.ts
 
   plugin-ledger-connector-fabric-12:
     continue-on-error: false
@@ -1449,7 +1449,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }}
       - run: npm run configure
-      - run: yarn ts-node ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/run-transaction-with-ws-ids.test.ts
+      - run: yarn tsx ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/run-transaction-with-ws-ids.test.ts
 
   cactus-plugin-ledger-connector-go-ethereum-socketio:
     continue-on-error: false

diff --git a/weaver/samples/besu/besu-cli/bin/besu-cli b/weaver/samples/besu/besu-cli/bin/besu-cli
@@ -13,7 +13,7 @@ if (wantsCompiled || !devMode) {
 } else {
   // this runs from the typescript source (for dev only)
   // hook into ts-node so we can run typescript on the fly
-  require('ts-node').register({ project: `${__dirname}/../tsconfig.json` })
+  require('ts-node').register({ project: `${__dirname}/../tsconfig.json`, experimentalResolver: true })
   // run the CLI with the current process arguments
   require(`${__dirname}/../src/cli`).run(process.argv)
 }

diff --git a/weaver/samples/fabric/fabric-cli/bin/fabric-cli b/weaver/samples/fabric/fabric-cli/bin/fabric-cli
@@ -13,7 +13,7 @@ if (wantsCompiled || !devMode) {
 } else {
   // this runs from the typescript source (for dev only)
   // hook into ts-node so we can run typescript on the fly
-  require('ts-node').register({ project: `${__dirname}/../tsconfig.json` })
+  require('ts-node').register({ project: `${__dirname}/../tsconfig.json`, experimentalResolver: true })
   // run the CLI with the current process arguments
   require(`${__dirname}/../src/cli`).run(process.argv)
 }