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

coveo · Apr 21, 2023 · 0014082 · 0014082
2 parents 714c702 + 5ce3cda
commit 0014082
Show file tree

Hide file tree

Showing 50 changed files with 3,501 additions and 1,778 deletions.
diff --git a/.github/actions/e2e-clean/action.yml b/.github/actions/e2e-clean/action.yml
@@ -20,16 +20,16 @@ runs:
       shell: bash
       env:
         DISPLAY: ':1'
-      if: always()
+      if: cancelled() || failure() || success()
       run: |
         Xvfb :1 -screen 0 1024x768x16 & sleep 1
         xdg-settings set default-web-browser google-chrome.desktop
         node -r ts-node/register/transpile-only packages/cli-e2e/cleaning.ts
     - name: Delete test orgs
       shell: bash
-      if: always()
+      if: cancelled() || failure() || success()
       run: node ./scripts/cleaning/delete-orgs.js
     - name: Delete test API key
       shell: bash
-      if: always()
+      if: cancelled() || failure() || success()
       run: node ./scripts/cleaning/delete-api-keys.js
diff --git a/.github/actions/e2e-login/action.yml b/.github/actions/e2e-login/action.yml
@@ -44,7 +44,7 @@ runs:
         echo "${{ env.E2E_TOKEN_PASSPHRASE }}" | gpg -a --batch --passphrase-fd 0 --symmetric --cipher-algo AES256 --output encodedConfig $CLI_CONFIG_PATH
         echo "cliConfigJson=$(base64 -w 0 encodedConfig)" >> $GITHUB_OUTPUT
     - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3
-      if: always()
+      if: cancelled() || failure() || success()
       with:
         name: login-test-artifacts
         path: ./packages/cli-e2e/artifacts
diff --git a/.github/actions/e2e-run/action.yml b/.github/actions/e2e-run/action.yml
@@ -73,7 +73,7 @@ runs:
       working-directory: packages/cli-e2e
       run: npm run jest:ci -- ${{inputs.spec}}
     - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3
-      if: always()
+      if: cancelled() || failure() || success()
       with:
         name: ${{inputs.os}}-${{inputs.spec}}-test-artifacts
         path: ./packages/cli-e2e/artifacts
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -122,7 +122,7 @@ jobs:
       - name: Setup E2E tests
         run: node -r ts-node/register/transpile-only packages/cli-e2e/setup/ci-verdaccio.ts
       - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3
-        if: always()
+        if: cancelled() || failure() || success()
         with:
           name: ${{matrix.os}}-verdaccio-publish-artifacts
           path: ./packages/cli-e2e/artifacts

diff --git a/.github/workflows/delete-resources.yml b/.github/workflows/delete-resources.yml
@@ -25,15 +25,15 @@ jobs:
       - run: npm ci
       - name: Resume org
         timeout-minutes: 30
-        if: always()
+        if: cancelled() || failure() || success()
         run: node ./scripts/cleaning/wake-org.mjs || true
       - name: Delete test API keys
         timeout-minutes: 30
-        if: always()
+        if: cancelled() || failure() || success()
         run: node ./scripts/cleaning/delete-api-keys.js --olderThan 1d
       - name: Delete test orgs
         timeout-minutes: 30
-        if: always()
+        if: cancelled() || failure() || success()
         run: |
           Xvfb :1 -screen 0 1024x768x16 & sleep 1
           xdg-settings set default-web-browser google-chrome.desktop
@@ -42,7 +42,7 @@ jobs:
         env:
           DISPLAY: ':1'
       - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3
-        if: always()
+        if: cancelled() || failure() || success()
         with:
           name: cleaning-artifacts
           path: ./packages/cli-e2e/artifacts