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 3 updates #1111

Closed
wants to merge 2 commits into from
Closed

Bump the github-actions group with 3 updates #1111

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eca52ae
Bump the github-actions group with 3 updates
dependabot[bot] Jan 14, 2024
bd292dd
ci(fix): make artifacts unique per workflow
amannocci Jan 15, 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
8 changes: 4 additions & 4 deletions .github/workflows/build-packages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
with:
name: package-parts-linux-x86-64
name: package-parts-${{ github.run_id }}-${{ github.run_attempt }}-linux-x86-64
path: agent/native/_build/linux-x86-64-release/ext
- uses: actions/download-artifact@v4
with:
name: package-parts-linuxmusl-x86-64
name: package-parts-${{ github.run_id }}-${{ github.run_attempt }}-linuxmusl-x86-64
path: agent/native/_build/linuxmusl-x86-64-release/ext
- name: package
run: make -C packaging package
- name: package info
run: make -C packaging info
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: package
name: package-${{ github.run_id }}-${{ github.run_attempt }}
path: |
build/packages/*
!build/packages/**/*.sha512
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ jobs:
- uses: actions/checkout@v4
- name: Build
run: make -f .ci/Makefile build
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: package-parts-${{ matrix.arch }}
name: package-parts-${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.arch }}
path: |
agent/native/_build/${{ matrix.arch }}-release/ext/elastic_apm*.so
agent/native/_build/${{ matrix.arch }}-release/ext/elastic_apm*.debug
10 changes: 5 additions & 5 deletions .github/workflows/phpt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
with:
name: package-parts-linux-x86-64
name: package-parts-${{ github.run_id }}-${{ github.run_attempt }}-linux-x86-64
path: agent/native/_build/linux-x86-64-release/ext/
- name: Run phpt tests from PHP source code
continue-on-error: true
Expand All @@ -51,18 +51,18 @@ jobs:
docker-compose up -d elasticsearch apm-server
docker-compose run phpt_${VERSION_SHORT}
docker-compose stop
# exit 0
# exit 0
- if: success() || failure()
name: Change results ownership
name: Change results ownership
continue-on-error: true
run: |
sudo chmod -R 777 agent/extension_phpt_test/results
sudo chown -R $(id -u):$(id -g) agent/extension_phpt_test/results
- if: success() || failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
continue-on-error: true
with:
name: phpt-test-results-${{ matrix.php-version }}
name: phpt-test-results-${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.php-version }}
path: agent/extension_phpt_test/results
if-no-files-found: error
- if: success() || failure()
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
with:
name: package
name: package-${{ github.run_id }}-${{ github.run_attempt }}
path: ${{ env.BUILD_PACKAGES }}

## NOTE: The name of the zip should match the name of the folder to be zipped.
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
triggerMessage: "${{ github.repository }}@${{ github.ref_name }} - sign artifacts"
waitFor: true
printBuildLogs: true
artifactName: signed-artifacts
artifactName: signed-artifacts-${{ github.run_id }}-${{ github.run_attempt }}
artifactPath: "signed-artifacts.zip"
buildEnvVars: |
BUNDLE_URL=https://storage.googleapis.com/${{ env.BUCKET_NAME }}/${{ steps.upload-file.outputs.uploaded }}
Expand All @@ -100,7 +100,7 @@ jobs:
with:
include: ${{ needs.generate-test-packages-matrix.outputs.include }}
max-parallel: 40
package-name: 'signed-artifacts'
package-name: 'signed-artifacts-${{ github.run_id }}-${{ github.run_attempt }}'

release:
needs:
Expand All @@ -116,7 +116,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
with:
name: signed-artifacts
name: signed-artifacts-${{ github.run_id }}-${{ github.run_attempt }}
path: ${{ env.BUILD_PACKAGES }}

- name: Unzip signed packages
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/test-packages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ jobs:

- uses: actions/download-artifact@v4
with:
name: ${{ inputs.package-name }}
name: ${{ inputs.package-name }}-${{ github.run_id }}-${{ github.run_attempt }}
path: ${{ env.BUILD_PACKAGES }}

## This will help with preparing the signed artifacts that were bundled in a zip file
- if: ${{ inputs.package-name == 'signed-artifacts' }}
- if: ${{ inputs.package-name == 'signed-artifacts-${{ github.run_id }}-${{ github.run_attempt }}' }}
name: Unzip signed packages
run: unzip ${PACKAGE_FILE} && rm ${PACKAGE_FILE}
working-directory: ${{ env.BUILD_PACKAGES }}
Expand All @@ -53,12 +53,12 @@ jobs:

- uses: actions/download-artifact@v4
with:
name: package-parts-linux-x86-64
name: package-parts-${{ github.run_id }}-${{ github.run_attempt }}-linux-x86-64
path: agent/native/_build/linux-x86-64-release/ext

- uses: actions/download-artifact@v4
with:
name: package-parts-linuxmusl-x86-64
name: package-parts-${{ github.run_id }}-${{ github.run_attempt }}-linuxmusl-x86-64
path: agent/native/_build/linuxmusl-x86-64-release/ext

- if: ${{ env.TESTING_TYPE == 'lifecycle' }}
Expand Down Expand Up @@ -100,9 +100,9 @@ jobs:
\;

- if: success() || failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: test-results
name: test-results-${{ github.run_id }}-${{ github.run_attempt }}
Copy link
Member

Choose a reason for hiding this comment

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

This will require changes in the test-reporter action. IIUC, when bumping upload-artifact@v4 is also required to bump the download-artifact@v4.

path: build/*junit.xml
if-no-files-found: error

Expand All @@ -116,8 +116,8 @@ jobs:
find . -name "syslog" -exec bash -c 'cp {} "../syslog-files/${ELASTIC_APM_PHP_TESTS_MATRIX_ROW//[^[:alnum:]]/-}-$(basename {})"' \;
find . -name "messages" -exec bash -c 'cp {} "../syslog-files/${ELASTIC_APM_PHP_TESTS_MATRIX_ROW//[^[:alnum:]]/-}-$(basename {})"' \;
- if: failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
continue-on-error: true
with:
name: syslogs
name: syslogs-${{ github.run_id }}-${{ github.run_attempt }}
path: build/syslog-files/
8 changes: 4 additions & 4 deletions .github/workflows/test-reporter.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
- uses: elastic/apm-pipeline-library/.github/actions/test-report@current
with:
artifact: test-results # artifact name
name: test-report # Name of the check run which will be created
path: "**/*.xml" # Path to test results (inside artifact .zip)
reporter: java-junit # Format of test results
artifact: test-results-${{ github.run_id }}-${{ github.run_attempt }}-(.*) # Artifact name
name: test-report # Name of the check run which will be created
path: "**/*.xml" # Path to test results (inside artifact .zip)
reporter: java-junit # Format of test results
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
run: make -f .ci/Makefile prepare
- uses: actions/download-artifact@v4
with:
name: package-parts-${{ matrix.arch }}
name: package-parts-${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.arch }}
path: agent/native/_build/${{ matrix.arch }}-release/ext/
- name: phpt-unit-tests
run: make -f .ci/Makefile run-phpt-tests
Expand Down Expand Up @@ -94,9 +94,9 @@ jobs:
-exec bash -c 'mv {} "build/${PHP_VERSION}-${DOCKERFILE}-$(basename {})"'
\;
- if: success() || failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: test-results
name: test-results-${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.php-version }}-${{ matrix.dockerfile }}
path: build/*junit.xml
if-no-files-found: error
build-packages:
Expand Down