Merge branch 'ci/node-20' into CDX-1408

coveo · Oct 18, 2023 · b8105f2 · b8105f2
2 parents 8092cad + 78c0536
commit b8105f2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git a/.github/actions/e2e-run/action.yml b/.github/actions/e2e-run/action.yml
@@ -39,7 +39,7 @@ runs:
     - uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3
       with:
         cache: 'npm'
-        node-version-file: '.nvmrc'
+        node-version: ${{inputs.node}}
     - uses: actions/setup-python@57ded4d7d5e986d7296eab16560982c6dd7c923b # v4
       with:
         cache: 'pip'
@@ -79,5 +79,5 @@ runs:
     - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3
       if: cancelled() || failure() || success()
       with:
-        name: ${{inputs.os}}-${{inputs.spec}}-test-artifacts
+        name: ${{inputs.os}}-${{inputs.node}}-${{inputs.spec}}-test-artifacts
         path: ./packages/cli-e2e/artifacts
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -134,6 +134,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ['ubuntu-20.04', 'windows-latest']
+        node: ['18', '20']
         spec:
           [
             'angular.specs.ts',
@@ -151,7 +152,7 @@ jobs:
             spec: auth.specs.ci.ts
     env:
       # ID of the test run to identify resources to teardown.
-      TEST_RUN_ID: 'id${{ matrix.os }}-${{ github.sha }}-${{ github.run_attempt }}g'
+      TEST_RUN_ID: 'id${{ matrix.os }}-${{ matrix.node }}-${{ github.sha }}-${{ github.run_attempt }}g'
       COVEO_DISABLE_AUTOUPDATE: true
       CLI_CONFIG_JSON: ${{needs.e2e-setup-login.outputs.cliConfigJson}}
     steps:

diff --git a/scripts/cleaning/delete-api-keys.js b/scripts/cleaning/delete-api-keys.js
@@ -1,6 +1,3 @@
-require('isomorphic-fetch');
-require('abortcontroller-polyfill');
-
 const {homedir} = require('os');
 const {join} = require('path');
 const {config} = require('dotenv');
@@ -9,9 +6,8 @@ config({path: join(homedir(), '.env')});
 
 function wasCreatedByTheCli(testRunId = '') {
   return (key) =>
-    (key.displayName?.startsWith(`cli-idwindows-latest-${testRunId}`) ||
-      key.displayName?.startsWith(`cli-idubuntu-20-04-${testRunId}`) ||
-      key.displayName?.startsWith(`cli-id${testRunId}`)) &&
+    key.displayName?.startsWith('cli-id') &&
+    key.displayName?.includes(testRunId) &&
     key.description === 'Generated by the Coveo CLI';
 }
 

diff --git a/scripts/cleaning/delete-orgs.js b/scripts/cleaning/delete-orgs.js
@@ -1,6 +1,3 @@
-require('isomorphic-fetch');
-require('abortcontroller-polyfill');
-
 const {homedir} = require('os');
 const {join} = require('path');
 const {config} = require('dotenv');
@@ -15,8 +12,8 @@ config({path: join(homedir(), '.env')});
 function wasCreatedByTheCli(testRunId = '') {
   return (key) =>
     testRunId
-      ? key.displayName?.startsWith(`cli-e2e-idwindows-latest-${testRunId}`) ||
-        key.displayName?.startsWith(`cli-e2e-idubuntu-20-04-${testRunId}`)
+      ? key.displayName?.startsWith('cli-e2e-id') &&
+        key.displayName?.includes(testRunId)
       : key.displayName?.match(/cli-e2e.*g/);
 }