fix artifact upload, build for MacOS intel

.github/workflows/test.yml

@@ -17,7 +17,7 @@ jobs:
           - { python-version: "3.7", os: "macos-latest", experimental: false }
           - { python-version: "3.8", os: "macos-latest", experimental: false }
           - { python-version: "3.9", os: "macos-latest", experimental: false }
-          - { python-version: "3.13", os: " windows-latest", experimental: false }
+          - { python-version: "3.13", os: "windows-latest", experimental: false }
         include:
           # Python 3.9 is on macos-13 but not macos-latest (macos-14-arm64)
           # https://github.com/actions/setup-python/issues/696#issuecomment-1637587760

.github/workflows/wheels.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest, macos-13, macos-latest, windows-latest]
       fail-fast: false
 
     steps:
@@ -36,7 +36,7 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
-          name: wheels
+          name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
           path: ./wheelhouse/*.whl
 
   build_sdist:
@@ -55,7 +55,7 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
-          name: sdist
+          name: cibw-sdist
           path: dist/*.tar.gz
 
   upload_pypi:
@@ -74,12 +74,9 @@ jobs:
     steps:
       - uses: actions/download-artifact@v4
         with:
-          name: wheels
-          path: dist
-      - uses: actions/download-artifact@v4
-        with:
-          name: sdist
+          pattern: cibw-*
           path: dist
+          merge-multiple: true
 
       - name: Publish package distributions to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1