github-actions: support test-report with download/upload v4 (#1499)

elastic · Nov 4, 2024 · 20a083a · 20a083a
1 parent 76169a8
commit 20a083a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -49,7 +49,7 @@ jobs:
         run: .ci/scripts/install-build-system.sh
       - name: Create gem
         run: rake build
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: package
           path: ./pkg/**/*

diff --git a/.github/workflows/run-matrix.yml b/.github/workflows/run-matrix.yml
@@ -47,10 +47,24 @@ jobs:
         run: ./spec/scripts/spec.sh ${{ matrix.version }} ${{ matrix.framework }}
         env:
           JUNIT_PREFIX: ${{ matrix.version }}-${{ matrix.framework }}
+
       - if: success() || failure()
-        uses: actions/upload-artifact@v3
+        id: normalize-junit
+        uses: actions/github-script@v7
+        with:
+          result-encoding: string
+          script: |
+            function normalizeName(name) {
+              return name.replace(/["/:<>|*?\\]/g, '-')
+            }
+            const framework = normalizeName('${{ matrix.framework }}')
+            const version = normalizeName('${{ matrix.version }}')
+            return `test-results-${version}-${framework}`
+      - if: success() || failure()
+        name: Upload JUnit Test Results
+        uses: actions/upload-artifact@v4
         with:
-          name: test-results
+          name: ${{ steps.normalize-junit.outputs.result }}
           path: "**/spec/junit-reports/**/*ruby-agent-junit.xml"
       - if: success() || failure()
         uses: actions/upload-artifact@v3

diff --git a/.github/workflows/test-reporter.yml b/.github/workflows/test-reporter.yml
@@ -10,15 +10,16 @@ on:
 
 permissions:
   contents: read
+  actions: read
   checks: write
 
 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: test-report
+          artifact: /test-results(.*)/
+          name: 'Test Report $1'
           path: "**/*ruby-agent-junit.xml"
           reporter: java-junit