Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@ jobs:
BUILD_ARCH: ${{ matrix.BUILD_ARCH }}
steps:
- uses: actions/checkout@v6
- uses: actions/download-artifact@v7
- uses: actions/download-artifact@v8
with:
name: package-parts-linux-${{ matrix.BUILD_ARCH }}
path: agent/native/_build/linux-${{ matrix.BUILD_ARCH }}-release/
- uses: actions/download-artifact@v7
- uses: actions/download-artifact@v8
with:
name: package-parts-linuxmusl-${{ matrix.BUILD_ARCH }}
path: agent/native/_build/linuxmusl-${{ matrix.BUILD_ARCH }}-release/
- name: Log in to the Container registry
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
with:
registry: ghcr.io
username: ${{ github.actor }}
Expand All @@ -39,7 +39,7 @@ jobs:
run: make -C packaging package
- name: package info
run: make -C packaging info
- uses: actions/upload-artifact@v6
- uses: actions/upload-artifact@v7
with:
name: packages-${{ matrix.BUILD_ARCH }}
path: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
echo "Detected CPUs: $(nproc)"
make -f .ci/Makefile build

- uses: actions/upload-artifact@v6
- uses: actions/upload-artifact@v7
with:
name: package-parts-${{ matrix.arch }}
path: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v6

- uses: actions/download-artifact@v7
- uses: actions/download-artifact@v8
with:
name: package-parts-linux-x86-64
path: agent/native/_build/linux-x86-64-release/

- uses: actions/download-artifact@v7
- uses: actions/download-artifact@v8
with:
name: package-parts-linuxmusl-x86-64
path: agent/native/_build/linuxmusl-x86-64-release/
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
type=raw,value=latest

- name: Log in to the Container registry
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/phpt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,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@v6
- uses: actions/download-artifact@v7
- uses: actions/download-artifact@v8
with:
name: package-parts-linux-x86-64
path: |
Expand All @@ -63,7 +63,7 @@ jobs:
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@v6
uses: actions/upload-artifact@v7
continue-on-error: true
with:
name: phpt-test-results-${{ matrix.php-version }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
- uses: actions/checkout@v6

- name: Download package artifacts
uses: actions/download-artifact@v7
uses: actions/download-artifact@v8
with:
pattern: packages-*
path: ${{ env.BUILD_PACKAGES }}
Expand Down Expand Up @@ -106,7 +106,7 @@ jobs:
# this artifact name is used also in some other places,
# such as ./.github/workflows/test-packages.yml.
# Therefore v4 cannot be used at the moment.
- uses: actions/upload-artifact@v6
- uses: actions/upload-artifact@v7
with:
name: signed-artifacts
path: signed-artifacts.zip
Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:
steps:

- uses: actions/checkout@v6
- uses: actions/download-artifact@v7
- uses: actions/download-artifact@v8
with:
name: signed-artifacts
path: ${{ env.BUILD_PACKAGES }}
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/test-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,21 @@ jobs:
steps:
- uses: actions/checkout@v6

- uses: actions/download-artifact@v7
- uses: actions/download-artifact@v8
if: ${{ inputs.package-name }}
with:
name: ${{ inputs.package-name }}
path: ${{ env.BUILD_PACKAGES }}

- uses: actions/download-artifact@v7
- uses: actions/download-artifact@v8
if: ${{ ! inputs.package-name }}
with:
pattern: 'package*'
merge-multiple: true
path: ${{ env.BUILD_PACKAGES }}

- name: Log in to the Container registry
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
with:
registry: ghcr.io
username: ${{ github.actor }}
Expand All @@ -70,12 +70,12 @@ jobs:
env:
PACKAGE_FILE: "${{ inputs.package-name }}.zip"

- uses: actions/download-artifact@v7
- uses: actions/download-artifact@v8
with:
name: package-parts-linux-x86-64
path: agent/native/_build/linux-x86-64-release

- uses: actions/download-artifact@v7
- uses: actions/download-artifact@v8
with:
name: package-parts-linuxmusl-x86-64
path: agent/native/_build/linuxmusl-x86-64-release
Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:
\;

- if: success() || failure()
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: test-results-${{ env.ELASTIC_APM_PHP_TESTS_MATRIX_ROW }}
path: build/*junit.xml
Expand All @@ -140,7 +140,7 @@ 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@v6
uses: actions/upload-artifact@v7
continue-on-error: true
with:
name: syslogs-${{ env.ELASTIC_APM_PHP_TESTS_MATRIX_ROW }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
BUILD_ARCHITECTURE: ${{ matrix.data.arch }}
steps:
- uses: actions/checkout@v6
- uses: actions/download-artifact@v7
- uses: actions/download-artifact@v8
with:
name: package-parts-${{ matrix.data.arch }}
path: agent/native/_build/${{ matrix.data.arch }}-release/
Expand Down Expand Up @@ -112,7 +112,7 @@ jobs:
-exec bash -c 'mv {} "build/${PHP_VERSION}-${DOCKERFILE}-$(basename {})"'
\;
- if: success() || failure()
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: test-results-${{ matrix.php-version }}-${{ matrix.dockerfile }}
path: build/*junit.xml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/updatecli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
"pull_requests": "write"
}

- uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
- uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
with:
registry: ghcr.io
username: ${{ github.actor }}
Expand Down
Loading