From 6d5f4505bedc2eab202aebb3856e18093ce75a09 Mon Sep 17 00:00:00 2001 From: Scott Lessans Date: Wed, 5 Nov 2025 09:05:19 -0800 Subject: [PATCH 1/4] fix mac cis --- .github/workflows/CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 4fcb76f..e03f1b1 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -140,10 +140,10 @@ jobs: strategy: matrix: platform: - - runner: macos-13 - target: x86_64 - runner: macos-14 target: aarch64 + - runner: macos-15 + target: aarch64 steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 From c22d0243fcf9d6e63b0320d9fb55e2d38e940d77 Mon Sep 17 00:00:00 2001 From: Scott Lessans Date: Wed, 5 Nov 2025 09:06:45 -0800 Subject: [PATCH 2/4] more pythons --- .github/workflows/CI.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index e03f1b1..fdd9d56 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -26,12 +26,13 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-14, windows-latest] + python-version: ["3.11", "3.12", "3.13"] steps: - uses: actions/checkout@v4 - name: Run composite test suite uses: ./.github/actions/run-rust-python-tests with: - python-version: "3.11" + python-version: ${{ matrix.python-version }} rust-toolchain: stable linux: From 01210e25f33af92f63d23c263720219b91e2c403 Mon Sep 17 00:00:00 2001 From: Scott Lessans Date: Wed, 5 Nov 2025 09:22:30 -0800 Subject: [PATCH 3/4] remove stale builds --- test_python.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test_python.sh b/test_python.sh index 51176a7..c3c9df8 100755 --- a/test_python.sh +++ b/test_python.sh @@ -1,5 +1,6 @@ #!/usr/bin/env bash set -e source .venv/bin/activate -maturin develop --release +rm -f python/openai_harmony/openai_harmony.cpython-*.so +maturin develop --release pytest "$@" From 406aca7de8d63a89641e4f8b6ea30db390aaff2f Mon Sep 17 00:00:00 2001 From: Scott Lessans Date: Wed, 5 Nov 2025 09:27:46 -0800 Subject: [PATCH 4/4] fix wheel uploads and only trigger on tags/workflow --- .github/workflows/CI.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index fdd9d56..9ac6602 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -67,6 +67,7 @@ jobs: sccache: ${{ !startsWith(github.ref, 'refs/tags/') }} manylinux: auto - name: Upload wheels + if: ${{ startsWith(github.ref, 'refs/tags/') || github.event_name == 'workflow_dispatch' }} uses: actions/upload-artifact@v4 with: name: wheels-linux-${{ matrix.platform.target }} @@ -102,6 +103,7 @@ jobs: sccache: ${{ !startsWith(github.ref, 'refs/tags/') }} manylinux: musllinux_1_2 - name: Upload wheels + if: ${{ startsWith(github.ref, 'refs/tags/') || github.event_name == 'workflow_dispatch' }} uses: actions/upload-artifact@v4 with: name: wheels-musllinux-${{ matrix.platform.target }} @@ -130,6 +132,7 @@ jobs: args: --release --out dist --find-interpreter sccache: ${{ !startsWith(github.ref, 'refs/tags/') }} - name: Upload wheels + if: ${{ startsWith(github.ref, 'refs/tags/') || github.event_name == 'workflow_dispatch' }} uses: actions/upload-artifact@v4 with: name: wheels-windows-${{ matrix.platform.target }} @@ -157,9 +160,10 @@ jobs: args: --release --out dist --find-interpreter sccache: ${{ !startsWith(github.ref, 'refs/tags/') }} - name: Upload wheels + if: ${{ startsWith(github.ref, 'refs/tags/') || github.event_name == 'workflow_dispatch' }} uses: actions/upload-artifact@v4 with: - name: wheels-macos-${{ matrix.platform.target }} + name: wheels-macos-${{ matrix.platform.runner }}-${{ matrix.platform.target }} path: dist sdist: @@ -173,6 +177,7 @@ jobs: command: sdist args: --out dist - name: Upload sdist + if: ${{ startsWith(github.ref, 'refs/tags/') || github.event_name == 'workflow_dispatch' }} uses: actions/upload-artifact@v4 with: name: wheels-sdist