Bump the github-actions group with 2 updates (#3532)

* Bump the github-actions group with 2 updates Bumps the github-actions group with 2 updates: [actions/upload-artifact](https://github.com/actions/upload-artifact) and [hashicorp/vault-action](https://github.com/hashicorp/vault-action). Updates `actions/upload-artifact` from 3 to 4 - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](actions/upload-artifact@v3...v4) Updates `hashicorp/vault-action` from 2.7.4 to 3.0.0 - [Release notes](https://github.com/hashicorp/vault-action/releases) - [Changelog](https://github.com/hashicorp/vault-action/blob/main/CHANGELOG.md) - [Commits](hashicorp/vault-action@v2.7.4...v3.0.0) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions - dependency-name: hashicorp/vault-action dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions ... Signed-off-by: dependabot[bot] <[email protected]> * Create unique test-results because upload-artifacts v4 does not support mutation anymore --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jonas Kunz <[email protected]>
elastic · Feb 21, 2024 · ae4fd11 · ae4fd11
1 parent 6fb00da
commit ae4fd11
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 23 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -74,50 +74,50 @@ jobs:
           path: ${{ github.workspace }}
 
       - name: Upload agent binaries as artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: elastic-apm-agent
           path: |
             ./elastic-apm-agent/target/elastic-apm-agent-*.jar
             !./**/*-sources.jar
       - name: Upload agent java 8 binaries as artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: elastic-apm-agent-java8
           path: |
             ./elastic-apm-agent-java8/target/elastic-apm-agent-java8-*.jar
             !./**/*-sources.jar
       - name: Upload agent attach CLI artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: apm-agent-attach-cli
           path: |
             ./apm-agent-attach-cli/target/apm-agent-attach-cli-*.jar
             !./**/*-sources.jar
             !./**/*-tests.jar
       - name: Upload agent attach artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: apm-agent-attach
           path: |
             ./apm-agent-attach/target/apm-agent-attach-*.jar
             !./**/*-sources.jar
       - name: Upload agent API artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: apm-agent-api
           path: |
             ./apm-agent-api/target/apm-agent-api-*.jar
             !./**/*-sources.jar
       - name: Upload agent plugin SDK artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: apm-agent-plugin-sdk
           path: |
             ./apm-agent-plugin-sdk/target/apm-agent-plugin-sdk-*.jar
             !./**/*-sources.jar
       - name: Upload benchmark binaries as artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: apm-agent-benchmarks
           path: |
@@ -160,9 +160,9 @@ jobs:
           command: ./mvnw test -DargLine="-Delastic.apm.overwrite.config.docs=false"
       - name: Store test results
         if: success() || failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: test-results
+          name: test-results-JUnit
           path: |
             **/junit-*.xml
             **/TEST-*.xml
@@ -198,9 +198,9 @@ jobs:
           command: ./mvnw -q -P ci-non-application-server-integration-tests verify
       - name: Store test results
         if: success() || failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: test-results
+          name: test-results-non-app-server-integration
           path: |
             **/junit-*.xml
             **/TEST-*.xml
@@ -237,9 +237,9 @@ jobs:
           command: ./mvnw -q -P ci-application-server-integration-tests verify
       - name: Store test results
         if: success() || failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: test-results
+          name: test-results-app-server-integration
           path: |
             **/junit-*.xml
             **/TEST-*.xml
@@ -278,9 +278,9 @@ jobs:
         run: ./mvnw test
       - name: Store test results
         if: success() || failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: test-results
+          name: test-results-windows
           path: |
             **/junit-*.xml
             **/TEST-*.xml
@@ -314,9 +314,9 @@ jobs:
         run: ./mvnw test -Delastic.jdkCompatibilityTest=true -Dtest_java_binary=${{ env.TEST_JAVA_BINARY }}
       - name: Store test results
         if: success() || failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: test-results
+          name: test-results-jdk-compatibility-${{ matrix.version }}-${{ matrix.distribution }}
           path: |
             **/junit-*.xml
             **/TEST-*.xml
@@ -347,9 +347,9 @@ jobs:
           command: ./mvnw -q -P ci-jboss-integration-tests verify
       - name: Store test results
         if: success() || failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: test-results
+          name: test-results-jboss-integration
           path: |
             **/junit-*.xml
             **/TEST-*.xml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -226,7 +226,7 @@ jobs:
           cache: 'maven'
       - name: Build Lambda-layer zip using agent from maven-central
         run: ./mvnw dependency:purge-local-repository package -pl apm-agent-lambda-layer
-      - uses: hashicorp/vault-action@v2.7.4
+      - uses: hashicorp/vault-action@v3.0.0
         with:
           url: ${{ secrets.VAULT_ADDR }}
           method: approle
@@ -242,7 +242,7 @@ jobs:
           VERSION=${VERSION//./-}
           
           ELASTIC_LAYER_NAME="elastic-apm-java-${VERSION}" .ci/publish-aws.sh
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: arn-file
           path: .ci/.arn-file.md

diff --git a/.github/workflows/test-reporter.yml b/.github/workflows/test-reporter.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: elastic/apm-pipeline-library/.github/actions/test-report@current
         with:
-          artifact: test-results            # artifact name
-          name: JUnit Tests                 # Name of the check run which will be created
+          artifact: /test-results-(.*)/
+          name: 'Test Results $1'
           path: "**/*.xml"                  # Path to test results (inside artifact .zip)
           reporter: java-junit              # Format of test results