From 891850e40fc9d7019aefbf3fdb95d34277156771 Mon Sep 17 00:00:00 2001 From: Brian Duranleau Date: Tue, 30 Jan 2024 11:46:01 -0600 Subject: [PATCH 1/3] chore: udpate gha workflow deps to node version 20 --- .github/workflows/code-coverage-baseline.yml | 30 ++++++++-------- .github/workflows/make-agent.yml | 8 ++--- .../workflows/make-for-platform-on-arch.yml | 8 ++--- .github/workflows/make-integration-tests.yml | 10 +++--- .github/workflows/release-build.yml | 12 +++---- .github/workflows/repolinter.yml | 4 +-- .github/workflows/test-agent.yml | 36 +++++++++---------- 7 files changed, 54 insertions(+), 54 deletions(-) diff --git a/.github/workflows/code-coverage-baseline.yml b/.github/workflows/code-coverage-baseline.yml index d5a700c28..dcef64963 100644 --- a/.github/workflows/code-coverage-baseline.yml +++ b/.github/workflows/code-coverage-baseline.yml @@ -32,13 +32,13 @@ jobs: arch: [amd64] steps: - name: Checkout newrelic-php-agent code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: php-agent repository: ${{ inputs.origin }}/newrelic-php-agent ref: ${{ inputs.ref }} - name: Login to Docker Hub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -55,7 +55,7 @@ jobs: -v "${GITHUB_WORKSPACE}/php-agent":"/usr/local/src/newrelic-php-agent" $IMAGE_NAME:$IMAGE_TAG-${{ matrix.platform }}-$IMAGE_VERSION daemon_test - name: Save integration_runner for integration tests - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: integration_runner-${{matrix.platform}}-${{matrix.arch}} path: php-agent/bin/integration_runner @@ -77,13 +77,13 @@ jobs: codecov: 1 steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: php-agent repository: ${{ inputs.origin }}/newrelic-php-agent ref: ${{ inputs.ref }} - name: Login to Docker Hub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -124,19 +124,19 @@ jobs: -e ENABLE_COVERAGE=${{matrix.codecov}} $IMAGE_NAME:$IMAGE_TAG-${{matrix.php}}-${{matrix.platform}}-$IMAGE_VERSION make agent-check - name: Save newrelic.so for integration tests - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: newrelic.so-${{matrix.platform}}-${{matrix.arch}}-${{matrix.php}} path: php-agent/agent/modules/newrelic.so - name: Save axiom gcov data files (*.gcno, *.gcna) if: ${{ matrix.codecov == 1 }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: axiom.gcov-${{matrix.platform}}-${{matrix.arch}}-${{matrix.php}} path: php-agent/axiom/*.gc* - name: Save agent gcov data files (*.gcno, *.gcna) if: ${{ matrix.codecov == 1 }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: agent.gcov-${{matrix.platform}}-${{matrix.arch}}-${{matrix.php}} path: php-agent/agent/.libs/*.gc* @@ -155,30 +155,30 @@ jobs: codecov: 1 steps: - name: Checkout integration tests - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: php-agent repository: ${{ inputs.origin }}/newrelic-php-agent ref: ${{ inputs.ref }} - name: Get integration_runner - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: integration_runner-${{matrix.platform}}-${{matrix.arch}} path: php-agent/bin - name: Get newrelic.so - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: newrelic.so-${{matrix.platform}}-${{matrix.arch}}-${{matrix.php}} path: php-agent/agent/modules - name: Get axiom gcov data files if: ${{ matrix.codecov == 1 }} - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: axiom.gcov-${{matrix.platform}}-${{matrix.arch}}-${{matrix.php}} path: php-agent/axiom - name: Get agent gcov data files if: ${{ matrix.codecov == 1 }} - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: agent.gcov-${{matrix.platform}}-${{matrix.arch}}-${{matrix.php}} path: php-agent/agent/.libs @@ -187,7 +187,7 @@ jobs: chmod 755 php-agent/bin/integration_runner chmod 755 php-agent/agent/modules/newrelic.so - name: Login to Docker Hub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -250,7 +250,7 @@ jobs: echo "COMMIT_HASH=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT - name: Upload coverage reports to Codecov if: ${{ matrix.codecov == 1 }} - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v3.1.5 with: token: ${{ secrets.CODECOV_TOKEN }} working-directory: ./php-agent diff --git a/.github/workflows/make-agent.yml b/.github/workflows/make-agent.yml index 9d2d76dd5..b29881676 100644 --- a/.github/workflows/make-agent.yml +++ b/.github/workflows/make-agent.yml @@ -35,19 +35,19 @@ jobs: php: ['8.0', '8.1', '8.2', '8.3'] steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: php-agent repository: ${{ inputs.origin }}/newrelic-php-agent ref: ${{ inputs.ref }} - name: Enable arm64 emulation if: ${{ inputs.arch == 'arm64' }} - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 with: image: tonistiigi/binfmt:${{vars.BINFMT_IMAGE_VERSION}} platforms: arm64 - name: Login to Docker Hub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -62,7 +62,7 @@ jobs: -v "${GITHUB_WORKSPACE}/php-agent":"/usr/local/src/newrelic-php-agent" $IMAGE_NAME:$IMAGE_TAG-${{matrix.php}}-${{matrix.platform}}-$IMAGE_VERSION make agent - name: Save newrelic.so for integration tests - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: newrelic.so-${{matrix.platform}}-${{inputs.arch}}-${{matrix.php}} path: php-agent/agent/modules/newrelic.so diff --git a/.github/workflows/make-for-platform-on-arch.yml b/.github/workflows/make-for-platform-on-arch.yml index 5f3933496..17f1d544e 100644 --- a/.github/workflows/make-for-platform-on-arch.yml +++ b/.github/workflows/make-for-platform-on-arch.yml @@ -54,19 +54,19 @@ jobs: platform: [gnu, musl] steps: - name: Checkout newrelic-php-agent code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: php-agent repository: ${{ inputs.origin }}/newrelic-php-agent ref: ${{ inputs.ref }} - name: Enable arm64 emulation if: ${{ inputs.arch == 'arm64' }} - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 with: image: tonistiigi/binfmt:${{vars.BINFMT_IMAGE_VERSION}} platforms: arm64 - name: Login to Docker Hub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -78,7 +78,7 @@ jobs: -e APP_supportability=${{secrets.APP_SUPPORTABILITY}} $IMAGE_NAME:$IMAGE_TAG-${{ matrix.platform }}-$IMAGE_VERSION ${{inputs.make-target}} - name: Save ${{inputs.make-target}} artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{inputs.artifact-name}}-${{matrix.platform}}-${{inputs.arch}} path: php-agent/${{ inputs.artifact-pattern }} diff --git a/.github/workflows/make-integration-tests.yml b/.github/workflows/make-integration-tests.yml index ab90a136b..800146f41 100644 --- a/.github/workflows/make-integration-tests.yml +++ b/.github/workflows/make-integration-tests.yml @@ -37,18 +37,18 @@ jobs: php: ['8.0', '8.1', '8.2', '8.3'] steps: - name: Checkout integration tests - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: php-agent repository: ${{ inputs.origin }}/newrelic-php-agent ref: ${{ inputs.ref }} - name: Get integration_runner - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: integration_runner-${{matrix.platform}}-${{inputs.arch}} path: php-agent/bin - name: Get newrelic.so - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: newrelic.so-${{matrix.platform}}-${{inputs.arch}}-${{matrix.php}} path: php-agent/agent/modules @@ -58,12 +58,12 @@ jobs: chmod 755 php-agent/agent/modules/newrelic.so - name: Enable arm64 emulation if: ${{ inputs.arch == 'arm64' }} - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 with: image: tonistiigi/binfmt:${{vars.BINFMT_IMAGE_VERSION}} platforms: arm64 - name: Login to Docker Hub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index 77f26bd92..30336b77b 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -35,12 +35,12 @@ jobs: arch: [amd64] steps: - name: Checkout newrelic-php-agent code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ github.event.client_payload.ref }} path: newrelic-php-agent - name: Login to Docker Hub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -52,7 +52,7 @@ jobs: -e BUILD_NUMBER=${{inputs.build-number}} $IMAGE_NAME:$IMAGE_TAG-${{ matrix.platform }}-$IMAGE_VERSION release-daemon - name: Save build artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: newrelic-php-agent/releases name: release-from-gha @@ -69,12 +69,12 @@ jobs: arch: [amd64] steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ github.event.client_payload.ref }} path: newrelic-php-agent - name: Login to Docker Hub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -87,7 +87,7 @@ jobs: -e BUILD_NUMBER=${{inputs.build-number}} $IMAGE_NAME:agent-builder-php${{matrix.php_ver}}-${{matrix.platform}}-$IMAGE_VERSION release-${{matrix.php_ver}}-gha - name: Save build artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: newrelic-php-agent/releases name: release-from-gha diff --git a/.github/workflows/repolinter.yml b/.github/workflows/repolinter.yml index e1e3c1cc1..db854c176 100644 --- a/.github/workflows/repolinter.yml +++ b/.github/workflows/repolinter.yml @@ -18,14 +18,14 @@ jobs: steps: - name: Test Default Branch id: default-branch - uses: actions/github-script@v2 + uses: actions/github-script@v7 with: script: | const data = await github.repos.get(context.repo) return data.data && data.data.default_branch === context.ref.split('/').slice(-1)[0] - name: Checkout Self if: ${{ steps.default-branch.outputs.result == 'true' }} - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Run Repolinter if: ${{ steps.default-branch.outputs.result == 'true' }} uses: newrelic/repolinter-action@v1 diff --git a/.github/workflows/test-agent.yml b/.github/workflows/test-agent.yml index 2736d2cc1..d40384e13 100644 --- a/.github/workflows/test-agent.yml +++ b/.github/workflows/test-agent.yml @@ -31,17 +31,17 @@ jobs: arch: [amd64, arm64] steps: - name: Checkout newrelic-php-agent code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: php-agent - name: Enable arm64 emulation if: ${{ matrix.arch == 'arm64' }} - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 with: image: tonistiigi/binfmt:${{vars.BINFMT_IMAGE_VERSION}} platforms: arm64 - name: Login to Docker Hub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -58,7 +58,7 @@ jobs: -v "${GITHUB_WORKSPACE}/php-agent":"/usr/local/src/newrelic-php-agent" $IMAGE_NAME:$IMAGE_TAG-${{ matrix.platform }}-$IMAGE_VERSION daemon_test - name: Save integration_runner for integration tests - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: integration_runner-${{matrix.platform}}-${{matrix.arch}} path: php-agent/bin/integration_runner @@ -91,17 +91,17 @@ jobs: codecov: 1 steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: php-agent - name: Enable arm64 emulation if: ${{ matrix.arch == 'arm64' }} - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 with: image: tonistiigi/binfmt:${{vars.BINFMT_IMAGE_VERSION}} platforms: arm64 - name: Login to Docker Hub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -159,19 +159,19 @@ jobs: -e ENABLE_COVERAGE=${{matrix.codecov}} $IMAGE_NAME:$IMAGE_TAG-${{matrix.php}}-${{matrix.platform}}-$IMAGE_VERSION make agent-${{ steps.get-check-variant.outputs.AGENT_CHECK_VARIANT }} - name: Save newrelic.so for integration tests - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: newrelic.so-${{matrix.platform}}-${{matrix.arch}}-${{matrix.php}} path: php-agent/agent/modules/newrelic.so - name: Save axiom gcov data files (*.gcno, *.gcna) if: ${{ matrix.codecov == 1 }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: axiom.gcov-${{matrix.platform}}-${{matrix.arch}}-${{matrix.php}} path: php-agent/axiom/*.gc* - name: Save agent gcov data files (*.gcno, *.gcna) if: ${{ matrix.codecov == 1 }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: agent.gcov-${{matrix.platform}}-${{matrix.arch}}-${{matrix.php}} path: php-agent/agent/.libs/*.gc* @@ -202,28 +202,28 @@ jobs: codecov: 1 steps: - name: Checkout integration tests - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: php-agent - name: Get integration_runner - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: integration_runner-${{matrix.platform}}-${{matrix.arch}} path: php-agent/bin - name: Get newrelic.so - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: newrelic.so-${{matrix.platform}}-${{matrix.arch}}-${{matrix.php}} path: php-agent/agent/modules - name: Get axiom gcov data files if: ${{ matrix.codecov == 1 }} - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: axiom.gcov-${{matrix.platform}}-${{matrix.arch}}-${{matrix.php}} path: php-agent/axiom - name: Get agent gcov data files if: ${{ matrix.codecov == 1 }} - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: agent.gcov-${{matrix.platform}}-${{matrix.arch}}-${{matrix.php}} path: php-agent/agent/.libs @@ -233,12 +233,12 @@ jobs: chmod 755 php-agent/agent/modules/newrelic.so - name: Enable arm64 emulation if: ${{ matrix.arch == 'arm64' }} - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 with: image: tonistiigi/binfmt:${{vars.BINFMT_IMAGE_VERSION}} platforms: arm64 - name: Login to Docker Hub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -296,7 +296,7 @@ jobs: nr-php make gcov - name: Upload coverage reports to Codecov if: ${{ matrix.codecov == 1 }} - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v3.1.5 with: token: ${{ secrets.CODECOV_TOKEN }} working-directory: ./php-agent From 7c13f60215ad07cb7d7227fd3919b40c7b2dc2cb Mon Sep 17 00:00:00 2001 From: Brian Duranleau Date: Tue, 30 Jan 2024 12:00:50 -0600 Subject: [PATCH 2/3] fix: update gh repo context rest call for v7 --- .github/workflows/repolinter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/repolinter.yml b/.github/workflows/repolinter.yml index db854c176..378cb4428 100644 --- a/.github/workflows/repolinter.yml +++ b/.github/workflows/repolinter.yml @@ -21,7 +21,7 @@ jobs: uses: actions/github-script@v7 with: script: | - const data = await github.repos.get(context.repo) + const data = await github.rest.repos.get(context.repo) return data.data && data.data.default_branch === context.ref.split('/').slice(-1)[0] - name: Checkout Self if: ${{ steps.default-branch.outputs.result == 'true' }} From 154fbd65d31329e6ae38a04700c042d92e21c98f Mon Sep 17 00:00:00 2001 From: Brian Duranleau Date: Fri, 2 Feb 2024 10:48:31 -0600 Subject: [PATCH 3/3] fix: revert incompatible upload/download-artifact action --- .github/workflows/code-coverage-baseline.yml | 16 ++++++++-------- .github/workflows/make-agent.yml | 2 +- .github/workflows/make-for-platform-on-arch.yml | 2 +- .github/workflows/make-integration-tests.yml | 4 ++-- .github/workflows/release-build.yml | 4 ++-- .github/workflows/test-agent.yml | 16 ++++++++-------- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/code-coverage-baseline.yml b/.github/workflows/code-coverage-baseline.yml index dcef64963..fa4052e35 100644 --- a/.github/workflows/code-coverage-baseline.yml +++ b/.github/workflows/code-coverage-baseline.yml @@ -55,7 +55,7 @@ jobs: -v "${GITHUB_WORKSPACE}/php-agent":"/usr/local/src/newrelic-php-agent" $IMAGE_NAME:$IMAGE_TAG-${{ matrix.platform }}-$IMAGE_VERSION daemon_test - name: Save integration_runner for integration tests - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: name: integration_runner-${{matrix.platform}}-${{matrix.arch}} path: php-agent/bin/integration_runner @@ -124,19 +124,19 @@ jobs: -e ENABLE_COVERAGE=${{matrix.codecov}} $IMAGE_NAME:$IMAGE_TAG-${{matrix.php}}-${{matrix.platform}}-$IMAGE_VERSION make agent-check - name: Save newrelic.so for integration tests - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: name: newrelic.so-${{matrix.platform}}-${{matrix.arch}}-${{matrix.php}} path: php-agent/agent/modules/newrelic.so - name: Save axiom gcov data files (*.gcno, *.gcna) if: ${{ matrix.codecov == 1 }} - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: name: axiom.gcov-${{matrix.platform}}-${{matrix.arch}}-${{matrix.php}} path: php-agent/axiom/*.gc* - name: Save agent gcov data files (*.gcno, *.gcna) if: ${{ matrix.codecov == 1 }} - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: name: agent.gcov-${{matrix.platform}}-${{matrix.arch}}-${{matrix.php}} path: php-agent/agent/.libs/*.gc* @@ -161,24 +161,24 @@ jobs: repository: ${{ inputs.origin }}/newrelic-php-agent ref: ${{ inputs.ref }} - name: Get integration_runner - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v3 with: name: integration_runner-${{matrix.platform}}-${{matrix.arch}} path: php-agent/bin - name: Get newrelic.so - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v3 with: name: newrelic.so-${{matrix.platform}}-${{matrix.arch}}-${{matrix.php}} path: php-agent/agent/modules - name: Get axiom gcov data files if: ${{ matrix.codecov == 1 }} - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v3 with: name: axiom.gcov-${{matrix.platform}}-${{matrix.arch}}-${{matrix.php}} path: php-agent/axiom - name: Get agent gcov data files if: ${{ matrix.codecov == 1 }} - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v3 with: name: agent.gcov-${{matrix.platform}}-${{matrix.arch}}-${{matrix.php}} path: php-agent/agent/.libs diff --git a/.github/workflows/make-agent.yml b/.github/workflows/make-agent.yml index b29881676..87a473159 100644 --- a/.github/workflows/make-agent.yml +++ b/.github/workflows/make-agent.yml @@ -62,7 +62,7 @@ jobs: -v "${GITHUB_WORKSPACE}/php-agent":"/usr/local/src/newrelic-php-agent" $IMAGE_NAME:$IMAGE_TAG-${{matrix.php}}-${{matrix.platform}}-$IMAGE_VERSION make agent - name: Save newrelic.so for integration tests - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: name: newrelic.so-${{matrix.platform}}-${{inputs.arch}}-${{matrix.php}} path: php-agent/agent/modules/newrelic.so diff --git a/.github/workflows/make-for-platform-on-arch.yml b/.github/workflows/make-for-platform-on-arch.yml index 17f1d544e..053d833ff 100644 --- a/.github/workflows/make-for-platform-on-arch.yml +++ b/.github/workflows/make-for-platform-on-arch.yml @@ -78,7 +78,7 @@ jobs: -e APP_supportability=${{secrets.APP_SUPPORTABILITY}} $IMAGE_NAME:$IMAGE_TAG-${{ matrix.platform }}-$IMAGE_VERSION ${{inputs.make-target}} - name: Save ${{inputs.make-target}} artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: name: ${{inputs.artifact-name}}-${{matrix.platform}}-${{inputs.arch}} path: php-agent/${{ inputs.artifact-pattern }} diff --git a/.github/workflows/make-integration-tests.yml b/.github/workflows/make-integration-tests.yml index 800146f41..9e08e0b5e 100644 --- a/.github/workflows/make-integration-tests.yml +++ b/.github/workflows/make-integration-tests.yml @@ -43,12 +43,12 @@ jobs: repository: ${{ inputs.origin }}/newrelic-php-agent ref: ${{ inputs.ref }} - name: Get integration_runner - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v3 with: name: integration_runner-${{matrix.platform}}-${{inputs.arch}} path: php-agent/bin - name: Get newrelic.so - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v3 with: name: newrelic.so-${{matrix.platform}}-${{inputs.arch}}-${{matrix.php}} path: php-agent/agent/modules diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index 30336b77b..b90fc891a 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -52,7 +52,7 @@ jobs: -e BUILD_NUMBER=${{inputs.build-number}} $IMAGE_NAME:$IMAGE_TAG-${{ matrix.platform }}-$IMAGE_VERSION release-daemon - name: Save build artifacts - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: path: newrelic-php-agent/releases name: release-from-gha @@ -87,7 +87,7 @@ jobs: -e BUILD_NUMBER=${{inputs.build-number}} $IMAGE_NAME:agent-builder-php${{matrix.php_ver}}-${{matrix.platform}}-$IMAGE_VERSION release-${{matrix.php_ver}}-gha - name: Save build artifacts - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: path: newrelic-php-agent/releases name: release-from-gha diff --git a/.github/workflows/test-agent.yml b/.github/workflows/test-agent.yml index d40384e13..0365b4ddb 100644 --- a/.github/workflows/test-agent.yml +++ b/.github/workflows/test-agent.yml @@ -58,7 +58,7 @@ jobs: -v "${GITHUB_WORKSPACE}/php-agent":"/usr/local/src/newrelic-php-agent" $IMAGE_NAME:$IMAGE_TAG-${{ matrix.platform }}-$IMAGE_VERSION daemon_test - name: Save integration_runner for integration tests - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: name: integration_runner-${{matrix.platform}}-${{matrix.arch}} path: php-agent/bin/integration_runner @@ -159,19 +159,19 @@ jobs: -e ENABLE_COVERAGE=${{matrix.codecov}} $IMAGE_NAME:$IMAGE_TAG-${{matrix.php}}-${{matrix.platform}}-$IMAGE_VERSION make agent-${{ steps.get-check-variant.outputs.AGENT_CHECK_VARIANT }} - name: Save newrelic.so for integration tests - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: name: newrelic.so-${{matrix.platform}}-${{matrix.arch}}-${{matrix.php}} path: php-agent/agent/modules/newrelic.so - name: Save axiom gcov data files (*.gcno, *.gcna) if: ${{ matrix.codecov == 1 }} - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: name: axiom.gcov-${{matrix.platform}}-${{matrix.arch}}-${{matrix.php}} path: php-agent/axiom/*.gc* - name: Save agent gcov data files (*.gcno, *.gcna) if: ${{ matrix.codecov == 1 }} - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: name: agent.gcov-${{matrix.platform}}-${{matrix.arch}}-${{matrix.php}} path: php-agent/agent/.libs/*.gc* @@ -206,24 +206,24 @@ jobs: with: path: php-agent - name: Get integration_runner - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v3 with: name: integration_runner-${{matrix.platform}}-${{matrix.arch}} path: php-agent/bin - name: Get newrelic.so - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v3 with: name: newrelic.so-${{matrix.platform}}-${{matrix.arch}}-${{matrix.php}} path: php-agent/agent/modules - name: Get axiom gcov data files if: ${{ matrix.codecov == 1 }} - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v3 with: name: axiom.gcov-${{matrix.platform}}-${{matrix.arch}}-${{matrix.php}} path: php-agent/axiom - name: Get agent gcov data files if: ${{ matrix.codecov == 1 }} - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v3 with: name: agent.gcov-${{matrix.platform}}-${{matrix.arch}}-${{matrix.php}} path: php-agent/agent/.libs