From f3aa60c951b75c708d1f8fb54cb22a81e2106559 Mon Sep 17 00:00:00 2001
From: Inada Naoki <songofacandy@gmail.com>
Date: Sun, 1 Jun 2025 18:25:46 +0900
Subject: [PATCH 1/2] upload to PyPI on create a release

---
 .github/workflows/wheel.yml | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml
index d97de1dd..afc4192a 100644
--- a/.github/workflows/wheel.yml
+++ b/.github/workflows/wheel.yml
@@ -1,8 +1,10 @@
-name: Build Wheels
+name: Build sdist and Wheels
 on:
   push:
     branches: [main]
-  create:
+  release:
+    types:
+      - published
   workflow_dispatch:
 
 jobs:
@@ -34,7 +36,7 @@ jobs:
           CIBW_SKIP: "pp* cp38-macosx_*"
 
       - name: Build sdist
-        if: runner.os == 'Linux'
+        if: runner.os == 'Linux' && runner.arch == 'X64'
         run: |
           pip install build
           python -m build -s -o wheelhouse
@@ -44,3 +46,25 @@ jobs:
         with:
           name: wheels-${{ matrix.os }}
           path: wheelhouse
+
+  # https://github.com/pypa/cibuildwheel/blob/main/examples/github-deploy.yml
+  upload_pypi:
+    needs: [build_wheels]
+    runs-on: ubuntu-latest
+    environment: pypi
+    permissions:
+      id-token: write
+    if: github.event_name == 'release' && github.event.action == 'published'
+    # or, alternatively, upload to PyPI on every tag starting with 'v' (remove on: release above to use this)
+    # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          # unpacks all CIBW artifacts into dist/
+          pattern: wheels-*
+          path: dist
+          merge-multiple: true
+
+      - uses: pypa/gh-action-pypi-publish@release/v1
+        #with:
+        # To test: repository-url: https://test.pypi.org/legacy/

From c0531d553ea993a5abdd0b861116e8c94783b148 Mon Sep 17 00:00:00 2001
From: Inada Naoki <songofacandy@gmail.com>
Date: Mon, 2 Jun 2025 13:54:37 +0900
Subject: [PATCH 2/2] aggregate all wheel zips

---
 .github/workflows/wheel.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml
index afc4192a..686d7dd0 100644
--- a/.github/workflows/wheel.yml
+++ b/.github/workflows/wheel.yml
@@ -47,6 +47,24 @@ jobs:
           name: wheels-${{ matrix.os }}
           path: wheelhouse
 
+  # combine all wheels into one artifact
+  combine_wheels:
+    needs: [build_wheels]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          # unpacks all CIBW artifacts into dist/
+          pattern: wheels-*
+          path: dist
+          merge-multiple: true
+
+      - name: Upload Wheels to artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: wheels-all
+          path: dist
+
   # https://github.com/pypa/cibuildwheel/blob/main/examples/github-deploy.yml
   upload_pypi:
     needs: [build_wheels]