Merge pull request #37 from wshanks/update-ci-python

Update software versions in CI, including enabling Python 3.12 wheels

.github/workflows/build.yml

@@ -17,7 +17,7 @@ jobs:
         submodules: 'recursive'
 
     - name: Add msbuild to PATH
-      uses: microsoft/setup-msbuild@v1.0.2
+      uses: microsoft/setup-msbuild@v2
       if: startsWith(matrix.os,'windows')
 
     - name: Add Windows SDK
@@ -26,10 +26,10 @@ jobs:
       run: |
         choco install windows-sdk-8.1
 
-    - uses: actions/setup-python@v1
+    - uses: actions/setup-python@v5
       name: Install Python
       with:
-        python-version: '3.7'
+        python-version: '3.12'
 
     - name: Build wheels
       env:
@@ -42,13 +42,13 @@ jobs:
         CIBW_ENVIRONMENT_MACOS: CMAKE_GENERATOR="Unix Makefiles"
         CIBW_ENVIRONMENT_WINDOWS: CMAKE_GENERATOR="Visual Studio 17 2022" CMAKE_GENERATOR_PLATFORM=x64
       run: |
-        python -m pip install cibuildwheel
+        python -m pip install cibuildwheel build
         python -m cibuildwheel --output-dir wheelhouse
 
     - name: Build source
       if: startsWith(matrix.os, 'ubuntu')
       run: |
-        python setup.py sdist --dist-dir=wheelhouse
+        python -m build --sdist --outdir=wheelhouse
 
     - name: Release to pypi
       if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
@@ -60,7 +60,19 @@ jobs:
         twine upload wheelhouse/*
 
     - name: Upload artifacts to github
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
-        name: wheels
+        name: wheels-${{ matrix.os }}
         path: ./wheelhouse
+
+  merge_artifacts:
+    name: Merge wheel artifacts from build_wheels OS matrix jobs
+    runs-on: ubuntu-latest
+    needs: build_wheels
+    steps:
+      - name: Merge artifacts
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: wheels
+          pattern: wheels-*
+          delete-merged: true