Refine github actions

Author: 3swordman

.github/workflows/README.md

@@ -11,43 +11,38 @@ This directory contains automated workflows for CI/CD.
 **What it does**:
 - Runs tests on multiple platforms (Ubuntu, macOS, Windows)
 - Tests with Node.js 18 and 20
-- Builds Python package
+- Tests Python package build
 - Lints code and checks grammar
 
 **Status Badge**:
 ```markdown
 ![CI](https://github.com/3swordman/tree-sitter-toon/workflows/CI/badge.svg)
 ```
 
-### 2. Publish to PyPI (`publish.yml`)
+### 2. Build and Publish to PyPI (`publish.yml`)
 
 **Triggers**:
-- Automatically on GitHub Release (publishes to PyPI)
-- Manually via workflow dispatch (choose Test PyPI or PyPI)
+- **Automatic**: When you push a tag (e.g., `v0.1.0`)
+- **Manual**: Via workflow dispatch (choose Test PyPI or PyPI)
 
 **What it does**:
-- Builds Python package
-- Checks package integrity
-- Publishes to Test PyPI or PyPI
-- Uploads artifacts
+- Builds wheels for **all platforms**:
+  - Linux (x86_64, aarch64) - manylinux
+  - macOS (x86_64, arm64) - Intel and Apple Silicon
+  - Windows (AMD64)
+- Builds wheels for **Python 3.10, 3.11, 3.12**
+- Builds source distribution
+- Tests all packages
+- Publishes to PyPI automatically
+
+**Total build time**: ~30-40 minutes
 
 **Manual Trigger**:
 1. Go to Actions tab
-2. Select "Publish to PyPI"
+2. Select "Build and Publish to PyPI"
 3. Click "Run workflow"
 4. Choose destination (testpypi/pypi)
 
-### 3. Create Release (`release.yml`)
-
-**Triggers**:
-- Automatically when you push a version tag (e.g., `v0.1.0`)
-- Manually via workflow dispatch
-
-**What it does**:
-- Generates changelog from git commits
-- Creates GitHub Release
-- Marks as pre-release if version contains alpha/beta/rc
-
 ## Setup Required
 
 ### 1. PyPI API Tokens
@@ -74,19 +69,23 @@ Ensure the repository has these permissions:
 
 ### Publishing a Release
 
-**Method 1: Tag-based (Automatic)**
+**Method 1: Tag-based (Automatic)** ⭐ Recommended
 ```bash
 # Update version in pyproject.toml to 0.1.0
 
 git add pyproject.toml
 git commit -m "Bump version to 0.1.0"
-git tag v0.1.0
 git push origin main
+
+git tag v0.1.0
 git push origin v0.1.0
 
-# This triggers:
-# 1. create-release.yml → Creates GitHub Release
-# 2. publish.yml → Publishes to PyPI
+# This automatically:
+# 1. Builds wheels for all platforms (Linux, macOS, Windows)
+# 2. Builds wheels for Python 3.10, 3.11, 3.12
+# 3. Builds source distribution
+# 4. Publishes everything to PyPI
+# 5. Takes ~30-40 minutes total
 ```
 
 **Method 2: Manual Release**

.github/workflows/build-wheels.yml

@@ -51,7 +51,7 @@ jobs:
         retention-days: 7
 
   build-python:
-    name: Build Python Package
+    name: Test Python Package Build
     runs-on: ubuntu-latest
 
     steps:
@@ -66,20 +66,13 @@ jobs:
     - name: Install build dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install build twine
+        pip install build twine cibuildwheel
     
-    - name: Build package
-      run: python -m build
+    - name: Build source distribution
+      run: python -m build --sdist
 
     - name: Check package
       run: twine check dist/*
-    
-    - name: Upload artifacts
-      uses: actions/upload-artifact@v4
-      with:
-        name: python-dist
-        path: dist/
-        retention-days: 7
 
   lint:
     name: Lint Code

.github/workflows/ci.yml

@@ -1,8 +1,9 @@
-name: Publish to PyPI
+name: Build and Publish to PyPI
 
 on:
-  release:
-    types: [published]
+  push:
+    tags:
+      - 'v*.*.*'
   workflow_dispatch:
     inputs:
       publish_to:
@@ -15,58 +16,74 @@ on:
           - pypi
 
 jobs:
-  publish:
-    name: Build and Publish Package
+  build_wheels:
+    name: Build wheels on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-13, macos-14]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Build wheels
+        uses: pypa/cibuildwheel@v2.16.5
+        env:
+          CIBW_BUILD: cp310-* cp311-* cp312-*
+          CIBW_SKIP: "*-musllinux_*"
+          CIBW_ARCHS_MACOS: x86_64 arm64
+          CIBW_ARCHS_LINUX: x86_64 aarch64
+          CIBW_ARCHS_WINDOWS: AMD64
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
+          path: ./wheelhouse/*.whl
+
+  build_sdist:
+    name: Build source distribution
     runs-on: ubuntu-latest
-    
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-    
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: '3.10'
-    
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install build twine setuptools wheel
-    
-    - name: Build package (source distribution only)
-      run: python -m build --sdist
-      
-    # Note: Binary wheels require proper manylinux/macosx tags
-    # Users will build locally from source distribution
-    
-    - name: Check package
-      run: twine check dist/*
-    
-    - name: List built files
-      run: |
-        echo "::group::Built packages"
-        ls -lh dist/
-        echo "::endgroup::"
-    
-    - name: Publish to Test PyPI
-      if: github.event.inputs.publish_to == 'testpypi' || github.event_name != 'release'
-      env:
-        TWINE_USERNAME: __token__
-        TWINE_PASSWORD: ${{ secrets.TEST_PYPI_API_TOKEN }}
-      run: |
-        twine upload --repository testpypi dist/* --verbose
-    
-    - name: Publish to PyPI
-      if: github.event.inputs.publish_to == 'pypi' || (github.event_name == 'release' && !github.event.release.prerelease)
-      env:
-        TWINE_USERNAME: __token__
-        TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
-      run: |
-        twine upload dist/* --verbose
+      - uses: actions/checkout@v4
+
+      - name: Build sdist
+        run: pipx run build --sdist
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: cibw-sdist
+          path: dist/*.tar.gz
+
+  upload_pypi:
+    needs: [build_wheels, build_sdist]
+    runs-on: ubuntu-latest
+    environment:
+      name: pypi
+      url: https://pypi.org/p/tree-sitter-toon
+    permissions:
+      id-token: write
 
-    - name: Upload build artifacts
-      uses: actions/upload-artifact@v4
-      with:
-        name: dist-packages
-        path: dist/
-        retention-days: 30
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          pattern: cibw-*
+          path: dist
+          merge-multiple: true
+
+      - name: List all files
+        run: ls -lh dist/
+
+      - name: Publish to Test PyPI
+        if: github.event.inputs.publish_to == 'testpypi'
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          repository-url: https://test.pypi.org/legacy/
+          password: ${{ secrets.TEST_PYPI_API_TOKEN }}
+          skip-existing: true
+
+      - name: Publish to PyPI
+        if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') || github.event.inputs.publish_to == 'pypi'
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          password: ${{ secrets.PYPI_API_TOKEN }}
+          skip-existing: true