Add fix to actions to publish wheels

Author: marco-2023

.github/workflows/build_wheels.yml

@@ -144,7 +144,7 @@ jobs:
           CIBW_ARCHS: ${{ matrix.buildplat[2] }}
           CIBW_PRERELEASE_PYTHONS: True
           CIBW_FREE_THREADED_SUPPORT: True
-          CIBW_OUTPUT_DIR: ./wheelhouse
+          CIBW_OUTPUT_DIR: ./dist
           CIBW_BUILD_VERBOSITY: 2
           CIBW_ENVIRONMENT: CFLAGS="-I/project/pyci/include" LDFLAGS="-L/project/pyci"
 
@@ -154,23 +154,29 @@ jobs:
           # macos-x86_64-accelerate wheels targeting macos-14 were renamed to 13
           # so they could be tested. Shift wheel name back to targeting 14.
           if [[ ${{ matrix.buildplat[0] }} == 'macos-13' && ${{ matrix.buildplat[4] }} == '14.0' ]]; then
-            mv ./wheelhouse/*.whl $(find ./wheelhouse -type f -name '*.whl' | sed 's/13_0/14_0/')
+            mv ./dist/*.whl $(find ./dist -type f -name '*.whl' | sed 's/13_0/14_0/')
           fi
 
       - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
         with:
-          path: ./wheelhouse/*.whl
+          path: ./dist/*.whl
           name: ${{ matrix.python[0] }}-${{ matrix.buildplat[1] }}
             ${{ matrix.buildplat[2] }} ${{ matrix.buildplat[3] }}
             ${{ matrix.buildplat[4] }}
 
+  merge-build-artifacts:
+    runs-on: ubuntu-latest
+    needs: build_wheels
+    steps:
+      - name: python-package-distributions
+        uses: actions/upload-artifact/merge@v4
+
   publish-to-pypi:
     name: Publish Python distribution to PyPI
-
     # only publish to PyPI on tag pushes
     if: startsWith(github.ref, 'refs/tags/')
     needs:
-      - build_wheels
+      - merge-build-artifacts
     runs-on: ubuntu-latest
     environment:
       name: PyPI-Release
@@ -182,7 +188,8 @@ jobs:
       - name: Download all the dists
         uses: actions/download-artifact@v4
         with:
-          path: wheelhouse
+          name: python-package-distributions
+          path: dist/
       - name: Publish distribution to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         env: