From eca52ae1d513d33fcfe0be76151e0a08c42539eb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 14 Jan 2024 22:25:14 +0000 Subject: [PATCH 1/2] Bump the github-actions group with 3 updates Bumps the github-actions group with 3 updates: [actions/download-artifact](https://github.com/actions/download-artifact), [google-github-actions/auth](https://github.com/google-github-actions/auth) and [google-github-actions/upload-cloud-storage](https://github.com/google-github-actions/upload-cloud-storage). Updates `actions/download-artifact` from 3 to 4 - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v3...v4) Updates `google-github-actions/auth` from 1 to 2 - [Release notes](https://github.com/google-github-actions/auth/releases) - [Changelog](https://github.com/google-github-actions/auth/blob/main/CHANGELOG.md) - [Commits](https://github.com/google-github-actions/auth/compare/v1...v2) Updates `google-github-actions/upload-cloud-storage` from 1 to 2 - [Release notes](https://github.com/google-github-actions/upload-cloud-storage/releases) - [Changelog](https://github.com/google-github-actions/upload-cloud-storage/blob/main/CHANGELOG.md) - [Commits](https://github.com/google-github-actions/upload-cloud-storage/compare/v1...v2) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions - dependency-name: google-github-actions/auth dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions - dependency-name: google-github-actions/upload-cloud-storage dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions ... Signed-off-by: dependabot[bot] --- .github/workflows/build-packages.yml | 4 ++-- .github/workflows/phpt.yml | 2 +- .github/workflows/release.yml | 8 ++++---- .github/workflows/test-packages.yml | 6 +++--- .github/workflows/test.yml | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml index 73cdbf757..87d167839 100644 --- a/.github/workflows/build-packages.yml +++ b/.github/workflows/build-packages.yml @@ -11,11 +11,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: package-parts-linux-x86-64 path: agent/native/_build/linux-x86-64-release/ext - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: package-parts-linuxmusl-x86-64 path: agent/native/_build/linuxmusl-x86-64-release/ext diff --git a/.github/workflows/phpt.yml b/.github/workflows/phpt.yml index 00962641d..be3d47c52 100644 --- a/.github/workflows/phpt.yml +++ b/.github/workflows/phpt.yml @@ -37,7 +37,7 @@ jobs: # tar --wildcards --strip-components 5 -xf /tmp/apm-agent-php-linux-x86-64.tar ./opt/elastic/apm-agent-php/extensions/elastic_apm* # cd - - uses: actions/checkout@v4 - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: package-parts-linux-x86-64 path: agent/native/_build/linux-x86-64-release/ext/ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9f2935b1c..9d16df45a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,7 +41,7 @@ jobs: BUCKET_NAME: "apm-agent-php" steps: - uses: actions/checkout@v4 - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: package path: ${{ env.BUILD_PACKAGES }} @@ -62,12 +62,12 @@ jobs: secret/observability-team/ci/apm-agent-php-bucket service-account | SERVICE_ACCOUNT ; - name: 'Authenticate to Google Cloud' - uses: 'google-github-actions/auth@v1' + uses: 'google-github-actions/auth@v2' with: credentials_json: '${{ env.SERVICE_ACCOUNT }}' - id: 'upload-file' - uses: 'google-github-actions/upload-cloud-storage@v1' + uses: 'google-github-actions/upload-cloud-storage@v2' with: path: "${{ env.BUILD_PACKAGES }}.zip" destination: "${{ env.BUCKET_NAME }}/${{ github.run_id }}" @@ -114,7 +114,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: signed-artifacts path: ${{ env.BUILD_PACKAGES }} diff --git a/.github/workflows/test-packages.yml b/.github/workflows/test-packages.yml index abef58ff0..e0f43d4cb 100644 --- a/.github/workflows/test-packages.yml +++ b/.github/workflows/test-packages.yml @@ -38,7 +38,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: ${{ inputs.package-name }} path: ${{ env.BUILD_PACKAGES }} @@ -51,12 +51,12 @@ jobs: env: PACKAGE_FILE: "${{ inputs.package-name }}.zip" - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: package-parts-linux-x86-64 path: agent/native/_build/linux-x86-64-release/ext - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: package-parts-linuxmusl-x86-64 path: agent/native/_build/linuxmusl-x86-64-release/ext diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 598abe3f5..0a3b03d4c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -53,7 +53,7 @@ jobs: - uses: actions/checkout@v4 - name: Prepare run: make -f .ci/Makefile prepare - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: package-parts-${{ matrix.arch }} path: agent/native/_build/${{ matrix.arch }}-release/ext/ From bd292dd0de23a889725fabc3515391f98f6edc2e Mon Sep 17 00:00:00 2001 From: Adrien Mannocci Date: Mon, 15 Jan 2024 11:46:56 +0100 Subject: [PATCH 2/2] ci(fix): make artifacts unique per workflow Signed-off-by: Adrien Mannocci --- .github/workflows/build-packages.yml | 8 ++++---- .github/workflows/build.yml | 4 ++-- .github/workflows/phpt.yml | 10 +++++----- .github/workflows/release.yml | 8 ++++---- .github/workflows/test-packages.yml | 16 ++++++++-------- .github/workflows/test-reporter.yml | 8 ++++---- .github/workflows/test.yml | 6 +++--- 7 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml index 87d167839..86f7323bf 100644 --- a/.github/workflows/build-packages.yml +++ b/.github/workflows/build-packages.yml @@ -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 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 625e0f82c..5367122ee 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 diff --git a/.github/workflows/phpt.yml b/.github/workflows/phpt.yml index be3d47c52..e4933137e 100644 --- a/.github/workflows/phpt.yml +++ b/.github/workflows/phpt.yml @@ -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 @@ -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() diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9d16df45a..cbdc39f50 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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. @@ -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 }} @@ -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: @@ -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 diff --git a/.github/workflows/test-packages.yml b/.github/workflows/test-packages.yml index e0f43d4cb..bb3e01aea 100644 --- a/.github/workflows/test-packages.yml +++ b/.github/workflows/test-packages.yml @@ -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 }} @@ -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' }} @@ -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 }} path: build/*junit.xml if-no-files-found: error @@ -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/ diff --git a/.github/workflows/test-reporter.yml b/.github/workflows/test-reporter.yml index 5e90d4559..e5e62b4b4 100644 --- a/.github/workflows/test-reporter.yml +++ b/.github/workflows/test-reporter.yml @@ -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 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0a3b03d4c..b2d5e3c4b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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 @@ -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: