Merge branch 'master' into renovate/lock-file-maintenance

coveo · Sep 27, 2023 · b3c6022 · b3c6022
2 parents 346e996 + c2a59ff
commit b3c6022
Show file tree

Hide file tree

Showing 51 changed files with 834 additions and 1,176 deletions.
diff --git a/.github/actions/e2e-run/action.yml b/.github/actions/e2e-run/action.yml
@@ -17,6 +17,10 @@ inputs:
     description: 'The NPM Registry to use'
     required: false
     default: 'https://registry.npmjs.org/'
+  jestFlags:
+    description: 'Flags for Jest'
+    required: false
+    default: ''
 
 runs:
   using: composite
@@ -61,7 +65,7 @@ runs:
       shell: bash
       if: ${{inputs.os == 'windows-latest'}}
       working-directory: packages/cli-e2e
-      run: npm run jest:ci -- ${{inputs.spec}}
+      run: npm run jest:ci -- ${{inputs.spec}} ${{inputs.flag}}
       env:
         npm_config_registry: ${{inputs.npmRegistry}}
     - name: Tests
@@ -71,7 +75,7 @@ runs:
         DISPLAY: ':1'
         npm_config_registry: ${{inputs.npmRegistry}}
       working-directory: packages/cli-e2e
-      run: npm run jest:ci -- ${{inputs.spec}}
+      run: npm run jest:ci -- ${{inputs.spec}} ${{inputs.flag}}
     - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3
       if: cancelled() || failure() || success()
       with:

diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -174,7 +174,7 @@ jobs:
           node: ${{ matrix.node }}
           spec: ${{ matrix.spec }}
           cliConfigJson: ${{ env.CLI_CONFIG_JSON }}
-          npmRegistry: 'http://localhost:4873'
+          npmRegistry: 'http://127.0.0.1:4873'
   e2e-teardown:
     timeout-minutes: 15
     name: End-to-end teardown