Migrate actions/{upload,download}-artifact to v4 artifact naming

brianschubert · Mar 13, 2024 · a0406f7 · a0406f7
1 parent d5b0350
commit a0406f7
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -46,8 +46,9 @@ jobs:
       - name: Retrieve 6S source archives
         uses: actions/download-artifact@v4
         with:
-          name: 6s-archives
+          pattern: 6s-archives-*
           path: 6s-archives
+          merge-multiple: true
 
       # Only build source distribution in a single job.
       # In the job that builds the source distribution, call 'build' with no arguments so that it builds the wheel
@@ -63,13 +64,13 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
-          name: dist-build
+          name: dist-build-${{ matrix.os }}
           path: dist
           if-no-files-found: error
 
       - uses: actions/upload-artifact@v4
         with:
-          name: buildpy-logs
+          name: buildpy-logs-${{ matrix.os }}
           path: ${{ matrix.os }}-buildpy.log
           if-no-files-found: error
 
@@ -79,8 +80,9 @@ jobs:
     steps:
       - uses: actions/download-artifact@v4
         with:
-          name: dist-build
+          pattern: dist-build-*
           path: dist
+          merge-multiple: true
 
       - name: Set up Python
         uses: actions/setup-python@v5
@@ -95,7 +97,7 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
-          name: dist-release
+          name: dist-release-${{ matrix.os }}
           path: dist
           if-no-files-found: error
 
@@ -116,8 +118,9 @@ jobs:
 
       - uses: actions/download-artifact@v4
         with:
-          name: dist-release
+          pattern: dist-release-*
           path: dist
+          merge-multiple: true
 
       # Makes sure that the installed distribution is from the wheels that were just built and not downloaded from PyPI.
       #   --no-index    - only search './dist' (not PyPI)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -29,8 +29,9 @@ jobs:
       - name: Retrieve distributions
         uses: actions/download-artifact@v4
         with:
-          name: dist-release
+          pattern: dist-release-*
           path: dist
+          merge-multiple: true
 
        # Verify that the version tag on all distribution files matches the pushed tag.
       - name: Check version consistency
@@ -137,8 +138,9 @@ jobs:
       - name: Retrieve distributions
         uses: actions/download-artifact@v4
         with:
-          name: dist-release
+          pattern: dist-release-*
           path: dist
+          merge-multiple: true
 
       - name: Publish distributions to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -35,8 +35,9 @@ jobs:
       - name: Retrieve 6S source archives
         uses: actions/download-artifact@v4
         with:
-          name: 6s-archives
+          pattern: 6s-archives-*
           path: 6s-archives
+          merge-multiple: true
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5

diff --git a/.github/workflows/web_artifact.yaml b/.github/workflows/web_artifact.yaml
@@ -33,6 +33,6 @@ jobs:
           curl --create-dirs --output-dir artifacts -O ${{ matrix.url }}
       - uses: actions/upload-artifact@v4
         with:
-          name: ${{ inputs.name }}
+          name: ${{ inputs.name }}-${{ matrix.url }}
           path: artifacts
           retention-days: ${{ inputs.retention-days }}