From 668b24dee9fa98ee33ebb3f01a739b1d0457a378 Mon Sep 17 00:00:00 2001 From: Iori Yanokura Date: Thu, 11 Jun 2026 23:12:09 +0900 Subject: [PATCH] [ga] Support windows-11-arm --- .github/workflows/release.yml | 28 +++++++++++++++++----------- .github/workflows/test.yml | 22 ++++++++++++++-------- pyproject.toml | 6 ++++++ 3 files changed, 37 insertions(+), 19 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9b29fc8..6311f93 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,11 +14,11 @@ jobs: prLabels: ${{ steps.get_labels.outputs.labels }} steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Get PR labels id: get_labels - uses: actions/github-script@v7 + uses: actions/github-script@v8 with: script: | const prs = context.payload.workflow_run.pull_requests; @@ -57,7 +57,7 @@ jobs: needs: auto-merge if: ${{ needs.auto-merge.outputs.mergeResult == 'merged' && contains(fromJson(needs.auto-merge.outputs.prLabels || '[]'), 'release') }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: ref: main fetch-depth: 0 @@ -70,7 +70,7 @@ jobs: echo "PR Labels: ${{ needs.auto-merge.outputs.prLabels }}" - name: Set up Python - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: '3.9' @@ -96,12 +96,12 @@ jobs: needs: auto-merge steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: ref: main submodules: true - name: Set up Python - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: '3.9' - name: Install build tool @@ -125,18 +125,24 @@ jobs: # Using macos-15-intel for Intel x86_64 architecture testing # macos-latest (ARM-based Apple Silicon) for general testing # https://github.blog/changelog/2025-09-19-github-actions-macos-13-runner-image-is-closing-down/ - os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, macos-15-intel, macos-latest] + # Note: windows-latest and windows-2025 move to a VS2026-only image in + # June 2026 (actions/runner-images#14017). scikit-build supports up to + # VS2022, so pin windows-2022 until the build migrates to + # scikit-build-core. + os: [ubuntu-latest, ubuntu-24.04-arm, windows-2022, windows-11-arm, macos-15-intel, macos-latest] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: ref: main submodules: true # Used to host cibuildwheel - - uses: actions/setup-python@v5 + - uses: actions/setup-python@v6 + with: + python-version: '3.12' - name: Install cibuildwheel - run: python -m pip install cibuildwheel==2.16.2 + run: python -m pip install cibuildwheel==3.4.1 - name: Build wheels run: python -m cibuildwheel --output-dir wheelhouse @@ -151,7 +157,7 @@ jobs: runs-on: ubuntu-latest environment: pypi steps: - - uses: actions/setup-python@v5 + - uses: actions/setup-python@v6 with: python-version: "3.12" - uses: actions/download-artifact@v4 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 450b81a..1643aff 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,9 +14,9 @@ jobs: name: Check Formatting runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Set up Python 3.8 - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: 3.8 - name: Install Formatting @@ -39,9 +39,9 @@ jobs: python-version: [3.8.16, 3.10.10, 3.12.8, 3.13.1, "3.14"] os: [ubuntu-latest] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} allow-prereleases: true @@ -69,17 +69,23 @@ jobs: # Using macos-15-intel for Intel x86_64 architecture testing # macos-latest (ARM-based Apple Silicon) for general testing # https://github.blog/changelog/2025-09-19-github-actions-macos-13-runner-image-is-closing-down/ - os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, macos-15-intel, macos-latest] + # Note: windows-latest and windows-2025 move to a VS2026-only image in + # June 2026 (actions/runner-images#14017). scikit-build supports up to + # VS2022, so pin windows-2022 until the build migrates to + # scikit-build-core. + os: [ubuntu-latest, ubuntu-24.04-arm, windows-2022, windows-11-arm, macos-15-intel, macos-latest] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: submodules: true # Used to host cibuildwheel - - uses: actions/setup-python@v5 + - uses: actions/setup-python@v6 + with: + python-version: '3.12' - name: Install cibuildwheel - run: python -m pip install cibuildwheel==2.16.2 + run: python -m pip install cibuildwheel==3.4.1 - name: Build wheels run: python -m cibuildwheel --output-dir wheelhouse diff --git a/pyproject.toml b/pyproject.toml index e4d9981..5b361eb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -39,6 +39,12 @@ Homepage = "https://github.com/iory/pySDFGen" Repository = "https://github.com/iory/pySDFGen" "Bug Tracker" = "https://github.com/iory/pySDFGen/issues" +[tool.cibuildwheel] +# 32-bit Windows builds fail on the windows-2025-vs2026 runner image +skip = "*-win32" +# PyPy wheels are opt-in since cibuildwheel 3.0 but were published for past releases +enable = ["pypy"] + [tool.setuptools] packages = ["pysdfgen"] include-package-data = false