Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump the github-actions group with 2 updates #3532

Merged
merged 2 commits into from
Feb 21, 2024
Merged

Bump the github-actions group with 2 updates #3532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53eed9d
Bump the github-actions group with 2 updates
dependabot[bot] Feb 18, 2024
1c7f7a6
Create unique test-results because upload-artifacts v4 does not suppo…
JonasKunz Feb 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-reporter.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Comment on lines +17 to +18
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice!

path: "**/*.xml" # Path to test results (inside artifact .zip)
reporter: java-junit # Format of test results
Loading