Updated Github Actions (#67)

* Some potential improvements to the workflow

* Specifying ARM arch for macos

* Upped setuptools version to protect against url injections

.github/workflows/build_deploy.yml

@@ -1,21 +1,9 @@
 name: CI-CD
 
 on:
-  push:
-    inputs:
-      allowDeploy:
-        description: "Whether to deploy."
-        required: true
-        default: true
-        type: boolean
+  push: {}
   pull_request:
     types: [opened, edited, synchronize, reopened]
-    inputs:
-      allowDeploy:
-        description: "Whether to deploy."
-        required: true
-        default: true
-        type: boolean
   workflow_dispatch:
     inputs:
       allowDeploy:
@@ -29,7 +17,8 @@ jobs:
     name: Prepare Matrix
     runs-on: ubuntu-latest
     outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
+      # Default to a single Linux build.
+      matrix: ${{ steps.set-matrix.outputs.matrix || '{"os":["ubuntu-latest"],"cibw_build":"cp39-manylinux_x86_64"}' }}
     steps:
       - uses: actions/checkout@v4.2.2
 
@@ -94,7 +83,6 @@ jobs:
               pytest -k 'not TestBeamSearch'; \
               pytest -k '_no_bw or _bw_m1'
           fi
-        shell: bash
 
   build_wheels:
     name: Build wheels
@@ -116,9 +104,11 @@ jobs:
           CIBW_BUILD: ${{ matrix.cibw_build }}
           CIBW_SKIP: ${{ matrix.cibw_skip }}
           CIBW_PROJECT_REQUIRES_PYTHON: ">=3.9"
+          CIBW_ARCHS_MACOS: "x86_64 arm64"
 
       - uses: actions/upload-artifact@v4
         with:
+          name: my-artifact-${{ matrix.os }}
           path: ./wheelhouse/*.whl
 
   build_sdist:
@@ -147,7 +137,7 @@ jobs:
           path: dist/*.tar.gz
 
   deploy:
-    if: github.ref == 'refs/heads/master' && ${{ inputs.allowDeploy }} == 'true'
+    if: github.ref == 'refs/heads/master' && (github.event_name != 'workflow_dispatch' || inputs.allowDeploy == 'true')
     needs: [build_wheels, build_sdist]
     runs-on: ubuntu-latest
     steps:
@@ -157,8 +147,9 @@ jobs:
 
       - uses: actions/download-artifact@v4
         with:
-          name: artifact
           path: dist
+          pattern: my-artifact-*
+          merge-multiple: true
 
       - name: Publish distribution to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1

requirements.txt

@@ -7,7 +7,7 @@ pybind11==2.11.1
 pytest==7.4.0
 pytest-order==1.1.0
 seaborn==0.12.2
-setuptools==68.0.0
+setuptools==75.8.0
 sphinx==7.0.1
 twine>=4.0.2
 wheel==0.40.0