Merge branch 'main' into clientcert-in-memory-update

elastic · Sep 12, 2024 · 6145794 · 6145794
2 parents e867d85 + 9600695
commit 6145794
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,7 +32,7 @@ jobs:
           node-version-file: .nvmrc
       - run: npm ci
       - run: npm run build
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: dist
           path: dist
@@ -48,9 +48,9 @@ jobs:
           node-version-file: .nvmrc
       - run: npm ci
       - run: npm run test:unit -- --ci --reporters=default --reporters=jest-junit
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: test-results
+          name: test-results-test
           path: "**/junit.xml"
           if-no-files-found: error
 
@@ -65,7 +65,7 @@ jobs:
           cache: npm
           node-version-file: .nvmrc
       - run: npm ci
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: dist
           path: dist
@@ -74,8 +74,8 @@ jobs:
         working-directory: __tests__/e2e
         env:
           TERM: xterm # this is needed for tput
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: test-results
+          name: test-results-e2e-test
           path: "**/junit.xml"
           if-no-files-found: error
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -32,7 +32,7 @@ jobs:
         env:
           TERM: xterm # this is needed for tput
       - if: success() || failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: test-results
           path: "**/junit_*.xml"

diff --git a/.github/workflows/test-reporter.yml b/.github/workflows/test-reporter.yml
@@ -18,9 +18,9 @@ jobs:
   report:
     runs-on: ubuntu-latest
     steps:
-      - uses: elastic/apm-pipeline-library/.github/actions/test-report@current
+      - uses: elastic/oblt-actions/test-report@v1
         with:
-          artifact: test-results
-          name: ${{ github.event.workflow_run.name }}-test-report
+          artifact: /test-results(.*)/
+          name: '${{ github.event.workflow_run.name }} - Test Report $1'
           path: "**/junit*.xml"
           reporter: java-junit