Skip to content

Commit 9d0d942

Browse files
committed
ci: fix macos issues
1 parent ba1d77e commit 9d0d942

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
strategy:
2727
fail-fast: false # If one platform fails, allow the rest to keep testing.
2828
matrix:
29-
python-version: [3.6, 3.7, 3.8, 3.9, 3.10-dev, pypy-3.6, pypy-3.7]
29+
python-version: [3.6, 3.7, 3.8, 3.9, "3.10", pypy-3.6, pypy-3.7]
3030
platform: [
3131
{ os: "macos-latest", python-architecture: "x64", rust-target: "x86_64-apple-darwin" },
3232
{ os: "ubuntu-latest", python-architecture: "x64", rust-target: "x86_64-unknown-linux-gnu" },
@@ -37,6 +37,9 @@ jobs:
3737
# No 64-bit pypy 3.6 on Windows
3838
- python-version: pypy-3.6
3939
platform: { os: "windows-latest", python-architecture: "x64" }
40+
# Macos 11 actions runners don't support pypy-3.6
41+
- python-version: pypy-3.6
42+
platform: { os: "macos-latest" }
4043
# No 32-bit pypy 3.7 on Windows
4144
- python-version: pypy-3.7
4245
platform: { os: "windows-latest", python-architecture: "x86" }
@@ -119,7 +122,7 @@ jobs:
119122
- name: Setup python
120123
uses: actions/setup-python@v2
121124
with:
122-
python-version: 3.6
125+
python-version: 3.9
123126

124127
- uses: actions-rs/toolchain@v1
125128
with:
@@ -139,21 +142,25 @@ jobs:
139142
run: |
140143
cd examples/rust_with_cffi/
141144
python --version
142-
pip install wheel
143-
python setup.py bdist_wheel --py-limited-api=cp36
145+
pip install -U pip wheel setuptools
146+
python setup.py bdist_wheel --py-limited-api=cp39
144147
ls -la dist/
148+
env:
149+
# https://github.com/actions/setup-python/issues/26
150+
MACOSX_DEPLOYMENT_TARGET: 10.9
145151

146152
# Now we switch to a differnet Python version and ensure we can install
147153
# the wheel we just built.
148154
- name: Setup python
149155
uses: actions/setup-python@v2
150156
with:
151-
python-version: 3.8
157+
python-version: "3.10"
152158

153159
- name: Install abi3 wheel and run tests
154160
shell: bash
155161
run: |
156162
cd examples/
163+
pip install -U pip wheel setuptools
157164
python --version
158165
pip install rust_with_cffi/dist/rust_with_cffi*.whl
159166
python -c "from rust_with_cffi import rust; assert rust.rust_func() == 14"

0 commit comments

Comments
 (0)