Migrate upload-artifact and download-artifact to v4 (#1230)

* Migrate upload-artifact and download-artifact to v4 * fix test-packages download * fix * fix typo
elastic · Sep 11, 2024 · 18ad84b · 18ad84b
1 parent f960634
commit 18ad84b
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 24 deletions.
diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
@@ -21,11 +21,11 @@ jobs:
       BUILD_ARCH: ${{ matrix.BUILD_ARCH }}
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: package-parts-linux-${{ matrix.BUILD_ARCH }}
           path: agent/native/_build/linux-${{ matrix.BUILD_ARCH }}-release/
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: package-parts-linuxmusl-${{ matrix.BUILD_ARCH }}
           path: agent/native/_build/linuxmusl-${{ matrix.BUILD_ARCH }}-release/
@@ -39,9 +39,9 @@ jobs:
         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-${{ matrix.BUILD_ARCH }}
           path: |
             build/packages/*
             !build/packages/**/*.sha512
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -52,7 +52,7 @@ jobs:
           echo "Detected CPUs: $(nproc)"
           make -f .ci/Makefile build
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: package-parts-${{ matrix.arch }}
           path: |

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
@@ -27,12 +27,12 @@ jobs:
       - name: Checkout repository
         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/
 
-      - 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/

diff --git a/.github/workflows/phpt.yml b/.github/workflows/phpt.yml
@@ -38,7 +38,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: |
@@ -62,7 +62,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@v3
+      uses: actions/upload-artifact@v4
       continue-on-error: true
       with:
         name: phpt-test-results-${{ matrix.php-version }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -52,9 +52,9 @@ jobs:
       contents: write
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@4
         with:
-          name: package
+          pattern: package-*
           path: ${{ env.BUILD_PACKAGES }}
 
       - name: generate build provenance
@@ -96,7 +96,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@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: signed-artifacts
           path: signed-artifacts.zip
@@ -131,7 +131,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
@@ -15,7 +15,6 @@ on:
         type: number
       package-name:
         description: "The artifact name with the binaries to be tested"
-        default: "package"
         required: false
         type: string
 
@@ -43,11 +42,19 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
+        if: ${{ inputs.package-name }}
         with:
           name: ${{ inputs.package-name }}
           path: ${{ env.BUILD_PACKAGES }}
 
+      - uses: actions/download-artifact@v4
+        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@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
         with:
@@ -63,12 +70,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
 
-      - 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
@@ -117,9 +124,9 @@ jobs:
           \;
 
       - if: success() || failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: test-results
+          name: test-results-${{ env.ELASTIC_APM_PHP_TESTS_MATRIX_ROW }}
           path: build/*junit.xml
           if-no-files-found: error
 
@@ -133,8 +140,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-${{ env.ELASTIC_APM_PHP_TESTS_MATRIX_ROW }}
           path: build/syslog-files/
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -64,7 +64,7 @@ jobs:
       BUILD_ARCHITECTURE: ${{ matrix.data.arch }}
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: package-parts-${{ matrix.data.arch }}
           path: agent/native/_build/${{ matrix.data.arch }}-release/
@@ -114,9 +114,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-${{ matrix.php-version }}-${{ matrix.dockerfile }}
           path: build/*junit.xml
           if-no-files-found: error
   build-packages: