change CI to match working PR wheels

Author: mikedh

.github/workflows/push.yml

@@ -1,6 +1,6 @@
-name: Build
+name: Build Pull Requests
 
-on: [push, pull_request, workflow_dispatch]
+on: [pull_request]
 
 jobs:
   formatting:
@@ -12,7 +12,7 @@ jobs:
       - name: Set up Python environment
         uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: "3.12"
       - name: ruff
         run: |
           pip install ruff

.github/workflows/release.yml

@@ -6,66 +6,23 @@ on:
       - master
 
 jobs:
-  create_release:
-    name: Create GitHub Release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 2
-      - name: Get changed files
-        id: changed-files
-        uses: tj-actions/changed-files@v35.4.1
-      - name: Tag Version
-        if: contains(steps.changed-files.outputs.modified_files, 'src/fcl/version.py')
-        id: set_tag
-        run: |
-          export VER=v$(python -c "exec(open('src/fcl/version.py','r').read());print(__version__)")
-          echo "tag_name=${VER}" >> $GITHUB_OUTPUT
-      - name: Create Release
-        if: contains(steps.changed-files.outputs.modified_files, 'src/fcl/version.py')
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ steps.set_tag.outputs.tag_name }}
-          release_name: ${{ steps.set_tag.outputs.tag_name }}
-          draft: false
-          prerelease: false
-    outputs:
-      mod_files: ${{ steps.changed-files.outputs.modified_files }}
-
   build_wheels:
-    if: contains(needs.create_release.outputs.mod_files, 'src/fcl/version.py')
     name: Build wheel on ${{matrix.platform}}
     runs-on: ${{matrix.platform}}
-    needs: create_release
     strategy:
       matrix:
         platform: [ubuntu-latest, macos-latest, windows-latest, macos-14]
     steps:
       - uses: actions/checkout@v3
       - name: Build wheels
         uses: pypa/cibuildwheel@v2.16.5
-        env:
-          CIBW_ARCHS_MACOS: 'x86_64 arm64'
       - uses: actions/upload-artifact@v3
         with:
           path: ./wheelhouse/*.whl
-      - uses: xresloader/upload-to-github-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          file: ./wheelhouse/*.whl
-          overwrite: true
-          draft: false
-          update_latest_release: true
 
   upload_pypi:
-    if: contains(needs.create_release.outputs.mod_files, 'src/fcl/version.py')
-    needs: [create_release, build_wheels]
+    name: Release To PyPi
+    needs: [build_wheels]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/download-artifact@v3
@@ -76,3 +33,26 @@ jobs:
         with:
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}
+
+  create_release:
+    name: Create GitHub Release
+    runs-on: ubuntu-latest
+    needs: [build_wheels]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 2
+      - name: Tag Version
+        id: set_tag
+        run: |
+          export VER=v$(python -c "exec(open('src/fcl/version.py','r').read());print(__version__)")
+          echo "tag_name=${VER}" >> $GITHUB_OUTPUT
+      - uses: actions/download-artifact@v3
+        with:
+          name: artifact
+          path: dist
+      - uses: ncipollo/release-action@v1.14.0
+        with:
+          artifacts: "dist/*"
+          tag: ${{ steps.set_tag.outputs.tag_name }}