From faee18172bb7bc72ade8a54f2a8bd0fae5e35018 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 2 Oct 2022 11:36:50 -1000
Subject: [PATCH] fix: build wheels from the sha saved after release (#64)

---
 .github/workflows/ci.yml     | 63 ++++++++++++++++++++++++++++++++++++
 .github/workflows/wheels.yml | 62 -----------------------------------
 2 files changed, 63 insertions(+), 62 deletions(-)
 delete mode 100644 .github/workflows/wheels.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8de76bad..57b0be33 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -96,3 +96,66 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           pypi_token: ${{ secrets.PYPI_TOKEN }}
+
+      - name: Save Release SHA
+        id: release_sha
+        shell: bash
+        run: |
+          echo "::set-output name=saved_release_sha::$(git rev-parse --short HEAD)"
+
+  build_wheels:
+    needs: [release]
+
+    name: Build wheels on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-20.04]
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ steps.release_sha.outputs.saved_release_sha }}
+          fetch-depth: 0
+
+      - name: Install poetry
+        run: pipx install poetry
+      # Used to host cibuildwheel
+      - name: Set up Python
+        uses: actions/setup-python@v4
+
+      - name: Install cibuildwheel
+        run: python -m pip install cibuildwheel==2.10.2
+
+      - name: Build wheels
+        run: python -m cibuildwheel --output-dir wheelhouse
+        # to supply options, put them in 'env', like:
+        env:
+          CIBW_SKIP: cp36-*
+          CIBW_BEFORE_ALL_LINUX: apt-get install -y gcc || yum install -y gcc || apk add gcc
+          CIBW_BUILD_VERBOSITY: 3
+          REQUIRE_CYTHON: 1
+
+      - uses: actions/upload-artifact@v3
+        with:
+          path: ./wheelhouse/*.whl
+
+  upload_pypi:
+    needs: [build_wheels]
+    runs-on: ubuntu-latest
+    environment: release
+
+    steps:
+      - uses: actions/download-artifact@v3
+        with:
+          # unpacks default artifact into dist/
+          # if `name: artifact` is omitted, the action will create extra parent dir
+          name: artifact
+          path: dist
+
+      - uses: pypa/gh-action-pypi-publish@v1.5.0
+        with:
+          user: __token__
+          password: ${{ secrets.PYPI_TOKEN }}
+
+          # To test: repository_url: https://test.pypi.org/legacy/
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
deleted file mode 100644
index 7f7068d5..00000000
--- a/.github/workflows/wheels.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-name: Wheels
-
-on:
-  create:
-    tags:
-      - "v*"
-
-jobs:
-  build_wheels:
-    name: Build wheels on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      matrix:
-        os: [ubuntu-20.04]
-
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Install poetry
-        run: pipx install poetry
-      # Used to host cibuildwheel
-      - name: Set up Python
-        uses: actions/setup-python@v4
-
-      - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==2.10.2
-
-      - name: Build wheels
-        run: python -m cibuildwheel --output-dir wheelhouse
-        # to supply options, put them in 'env', like:
-        env:
-          CIBW_SKIP: cp36-*
-          CIBW_BEFORE_ALL_LINUX: apt-get install -y gcc || yum install -y gcc || apk add gcc
-          CIBW_BUILD_VERBOSITY: 3
-          REQUIRE_CYTHON: 1
-
-      - uses: actions/upload-artifact@v3
-        with:
-          path: ./wheelhouse/*.whl
-
-  upload_pypi:
-    needs: [build_wheels]
-    runs-on: ubuntu-latest
-    environment: release
-
-    steps:
-      - uses: actions/download-artifact@v3
-        with:
-          # unpacks default artifact into dist/
-          # if `name: artifact` is omitted, the action will create extra parent dir
-          name: artifact
-          path: dist
-
-      - uses: pypa/gh-action-pypi-publish@v1.5.0
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_TOKEN }}
-
-          # To test: repository_url: https://test.pypi.org/legacy/