Merge pull request #405 from rsagroup/ci-build-upload-artifacts-compa…

…t-publish

CI: Help publish step find the binary artifacts

.github/workflows/publish.yml

@@ -22,18 +22,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download all  artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          path: artifacts
+          path: dist
+          merge-multiple: true
       - name: List files
-        run: ls -R artifacts
-      - name: Gather artifacts
-        run: |
-          mkdir dist
-          mv artifacts/source/*.tar.gz dist/
-          mv artifacts/wheels-macos-latest/*.whl dist/
-          mv artifacts/wheels-ubuntu-latest/*.whl dist/
-          mv artifacts/wheels-windows-latest/*.whl dist/
+        run: ls -R dist
       - name: Publish package
         uses: pypa/[email protected]
         with:

.github/workflows/testbuild.yml

@@ -75,9 +75,9 @@ jobs:
         pip install -q twine
         twine check dist/*
     - name: Store artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: source
+        name: source-${{ matrix.os }}-${{ matrix.python-version }}
         path: dist/*
         if-no-files-found: error
         retention-days: 1
@@ -110,7 +110,7 @@ jobs:
     - name: Store artifact
       uses: actions/upload-artifact@v4
       with:
-        name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
+        name: wheels-${{ matrix.os }}
         path: dist/*.whl
         if-no-files-found: error
         retention-days: 1