diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1036425c..1e5a1151 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -330,7 +330,7 @@ jobs: - target: x86_64-apple-darwin runner: macos-15-intel - target: aarch64-apple-darwin - runner: macos-latest + runner: macos-15 steps: - uses: actions/checkout@v7 @@ -625,7 +625,7 @@ jobs: static_lib: libpolyglot_sql_ffi.a use_cross: false target_dir: target - - os: macos-latest + - os: macos-15 target: aarch64-apple-darwin archive_name: macos-aarch64 archive_ext: tar.gz diff --git a/.github/workflows/python-fork-release.yml b/.github/workflows/python-fork-release.yml index 697a855d..7f203bb0 100644 --- a/.github/workflows/python-fork-release.yml +++ b/.github/workflows/python-fork-release.yml @@ -71,8 +71,11 @@ jobs: include: - target: x86_64-apple-darwin runner: macos-15-intel + smoke: true + # Cross-compiled on the Intel runner: this repository gets no arm64 macOS runner. - target: aarch64-apple-darwin - runner: macos-latest + runner: macos-15-intel + smoke: false steps: - uses: actions/checkout@v7 @@ -88,11 +91,18 @@ jobs: sccache: true - name: Smoke test wheel + if: matrix.smoke run: | ls dist/*-abi3-*.whl python -m pip install --no-index --find-links dist polyglot-sql-chio python -c "import polyglot_sql; assert polyglot_sql.parse_one('SELECT 1', dialect='postgres')" + - name: Check cross-compiled wheel + if: ${{ !matrix.smoke }} + run: | + ls dist/*-abi3-macosx_*_arm64.whl + unzip -l dist/*-abi3-macosx_*_arm64.whl | grep -q 'polyglot_sql/.*\.so$' + - name: Upload wheel uses: actions/upload-artifact@v7 with: