Skip to content

Commit

Permalink
Fix arch this time.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ionelmc
ionelmc committed May 2, 2024
1 parent 5cd0f61 commit a15697d
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 33 deletions.
64 changes: 32 additions & 32 deletions .github/workflows/github-actions.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- name: 'cpy38-pure-cover (macos/arm64)'
python: '3.8'
toxpython: 'python3.8'
python_arch: 'x64'
python_arch: 'arm64'
tox_env: 'cpy38-pure-cover'
cover: true
cibw_arch: 'arm64'
Expand All @@ -65,7 +65,7 @@ jobs:
- name: 'cpy38-pure-nocov (macos/arm64)'
python: '3.8'
toxpython: 'python3.8'
python_arch: 'x64'
python_arch: 'arm64'
tox_env: 'cpy38-pure-nocov'
cibw_arch: 'arm64'
cibw_build: false
Expand All @@ -91,7 +91,7 @@ jobs:
- name: 'cpy38-cython-cover (macos/arm64)'
python: '3.8'
toxpython: 'python3.8'
python_arch: 'x64'
python_arch: 'arm64'
tox_env: 'cpy38-cython-cover'
cover: true
cibw_arch: 'arm64'
Expand Down Expand Up @@ -148,7 +148,7 @@ jobs:
- name: 'cpy38-cython-nocov (macos/arm64)'
python: '3.8'
toxpython: 'python3.8'
python_arch: 'x64'
python_arch: 'arm64'
tox_env: 'cpy38-cython-nocov'
cibw_arch: 'arm64'
cibw_build: 'cp38-*'
Expand All @@ -174,7 +174,7 @@ jobs:
- name: 'cpy39-pure-cover (macos/arm64)'
python: '3.9'
toxpython: 'python3.9'
python_arch: 'x64'
python_arch: 'arm64'
tox_env: 'cpy39-pure-cover'
cover: true
cibw_arch: 'arm64'
Expand All @@ -199,7 +199,7 @@ jobs:
- name: 'cpy39-pure-nocov (macos/arm64)'
python: '3.9'
toxpython: 'python3.9'
python_arch: 'x64'
python_arch: 'arm64'
tox_env: 'cpy39-pure-nocov'
cibw_arch: 'arm64'
cibw_build: false
Expand All @@ -225,7 +225,7 @@ jobs:
- name: 'cpy39-cython-cover (macos/arm64)'
python: '3.9'
toxpython: 'python3.9'
python_arch: 'x64'
python_arch: 'arm64'
tox_env: 'cpy39-cython-cover'
cover: true
cibw_arch: 'arm64'
Expand Down Expand Up @@ -282,7 +282,7 @@ jobs:
- name: 'cpy39-cython-nocov (macos/arm64)'
python: '3.9'
toxpython: 'python3.9'
python_arch: 'x64'
python_arch: 'arm64'
tox_env: 'cpy39-cython-nocov'
cibw_arch: 'arm64'
cibw_build: 'cp39-*'
Expand All @@ -308,7 +308,7 @@ jobs:
- name: 'cpy310-pure-cover (macos/arm64)'
python: '3.10'
toxpython: 'python3.10'
python_arch: 'x64'
python_arch: 'arm64'
tox_env: 'cpy310-pure-cover'
cover: true
cibw_arch: 'arm64'
Expand All @@ -333,7 +333,7 @@ jobs:
- name: 'cpy310-pure-nocov (macos/arm64)'
python: '3.10'
toxpython: 'python3.10'
python_arch: 'x64'
python_arch: 'arm64'
tox_env: 'cpy310-pure-nocov'
cibw_arch: 'arm64'
cibw_build: false
Expand All @@ -359,7 +359,7 @@ jobs:
- name: 'cpy310-cython-cover (macos/arm64)'
python: '3.10'
toxpython: 'python3.10'
python_arch: 'x64'
python_arch: 'arm64'
tox_env: 'cpy310-cython-cover'
cover: true
cibw_arch: 'arm64'
Expand Down Expand Up @@ -416,7 +416,7 @@ jobs:
- name: 'cpy310-cython-nocov (macos/arm64)'
python: '3.10'
toxpython: 'python3.10'
python_arch: 'x64'
python_arch: 'arm64'
tox_env: 'cpy310-cython-nocov'
cibw_arch: 'arm64'
cibw_build: 'cp310-*'
Expand All @@ -442,7 +442,7 @@ jobs:
- name: 'pypy38-pure-cover (macos/arm64)'
python: 'pypy-3.8'
toxpython: 'pypy3.8'
python_arch: 'x64'
python_arch: 'arm64'
tox_env: 'pypy38-pure-cover'
cover: true
cibw_arch: 'arm64'
Expand All @@ -467,7 +467,7 @@ jobs:
- name: 'pypy38-pure-nocov (macos/arm64)'
python: 'pypy-3.8'
toxpython: 'pypy3.8'
python_arch: 'x64'
python_arch: 'arm64'
tox_env: 'pypy38-pure-nocov'
cibw_arch: 'arm64'
cibw_build: false
Expand All @@ -493,7 +493,7 @@ jobs:
- name: 'pypy38-cython-cover (macos/arm64)'
python: 'pypy-3.8'
toxpython: 'pypy3.8'
python_arch: 'x64'
python_arch: 'arm64'
tox_env: 'pypy38-cython-cover'
cover: true
cibw_arch: 'arm64'
Expand All @@ -518,7 +518,7 @@ jobs:
- name: 'pypy38-cython-nocov (macos/arm64)'
python: 'pypy-3.8'
toxpython: 'pypy3.8'
python_arch: 'x64'
python_arch: 'arm64'
tox_env: 'pypy38-cython-nocov'
cibw_arch: 'arm64'
cibw_build: false
Expand All @@ -544,7 +544,7 @@ jobs:
- name: 'pypy39-pure-cover (macos/arm64)'
python: 'pypy-3.9'
toxpython: 'pypy3.9'
python_arch: 'x64'
python_arch: 'arm64'
tox_env: 'pypy39-pure-cover'
cover: true
cibw_arch: 'arm64'
Expand All @@ -569,7 +569,7 @@ jobs:
- name: 'pypy39-pure-nocov (macos/arm64)'
python: 'pypy-3.9'
toxpython: 'pypy3.9'
python_arch: 'x64'
python_arch: 'arm64'
tox_env: 'pypy39-pure-nocov'
cibw_arch: 'arm64'
cibw_build: false
Expand All @@ -595,7 +595,7 @@ jobs:
- name: 'pypy39-cython-cover (macos/arm64)'
python: 'pypy-3.9'
toxpython: 'pypy3.9'
python_arch: 'x64'
python_arch: 'arm64'
tox_env: 'pypy39-cython-cover'
cover: true
cibw_arch: 'arm64'
Expand All @@ -620,7 +620,7 @@ jobs:
- name: 'pypy39-cython-nocov (macos/arm64)'
python: 'pypy-3.9'
toxpython: 'pypy3.9'
python_arch: 'x64'
python_arch: 'arm64'
tox_env: 'pypy39-cython-nocov'
cibw_arch: 'arm64'
cibw_build: false
Expand All @@ -646,7 +646,7 @@ jobs:
- name: 'pypy310-pure-cover (macos/arm64)'
python: 'pypy-3.10'
toxpython: 'pypy3.10'
python_arch: 'x64'
python_arch: 'arm64'
tox_env: 'pypy310-pure-cover'
cover: true
cibw_arch: 'arm64'
Expand All @@ -671,7 +671,7 @@ jobs:
- name: 'pypy310-pure-nocov (macos/arm64)'
python: 'pypy-3.10'
toxpython: 'pypy3.10'
python_arch: 'x64'
python_arch: 'arm64'
tox_env: 'pypy310-pure-nocov'
cibw_arch: 'arm64'
cibw_build: false
Expand All @@ -697,7 +697,7 @@ jobs:
- name: 'pypy310-cython-cover (macos/arm64)'
python: 'pypy-3.10'
toxpython: 'pypy3.10'
python_arch: 'x64'
python_arch: 'arm64'
tox_env: 'pypy310-cython-cover'
cover: true
cibw_arch: 'arm64'
Expand All @@ -722,7 +722,7 @@ jobs:
- name: 'pypy310-cython-nocov (macos/arm64)'
python: 'pypy-3.10'
toxpython: 'pypy3.10'
python_arch: 'x64'
python_arch: 'arm64'
tox_env: 'pypy310-cython-nocov'
cibw_arch: 'arm64'
cibw_build: false
Expand All @@ -748,7 +748,7 @@ jobs:
- name: 'cpy311-pure-cover (macos/arm64)'
python: '3.11'
toxpython: 'python3.11'
python_arch: 'x64'
python_arch: 'arm64'
tox_env: 'cpy311-pure-cover'
cover: true
cibw_arch: 'arm64'
Expand All @@ -773,7 +773,7 @@ jobs:
- name: 'cpy311-pure-nocov (macos/arm64)'
python: '3.11'
toxpython: 'python3.11'
python_arch: 'x64'
python_arch: 'arm64'
tox_env: 'cpy311-pure-nocov'
cibw_arch: 'arm64'
cibw_build: false
Expand All @@ -799,7 +799,7 @@ jobs:
- name: 'cpy311-cython-cover (macos/arm64)'
python: '3.11'
toxpython: 'python3.11'
python_arch: 'x64'
python_arch: 'arm64'
tox_env: 'cpy311-cython-cover'
cover: true
cibw_arch: 'arm64'
Expand Down Expand Up @@ -856,7 +856,7 @@ jobs:
- name: 'cpy311-cython-nocov (macos/arm64)'
python: '3.11'
toxpython: 'python3.11'
python_arch: 'x64'
python_arch: 'arm64'
tox_env: 'cpy311-cython-nocov'
cibw_arch: 'arm64'
cibw_build: 'cp311-*'
Expand All @@ -882,7 +882,7 @@ jobs:
- name: 'cpy312-pure-cover (macos/arm64)'
python: '3.12'
toxpython: 'python3.12'
python_arch: 'x64'
python_arch: 'arm64'
tox_env: 'cpy312-pure-cover'
cover: true
cibw_arch: 'arm64'
Expand All @@ -907,7 +907,7 @@ jobs:
- name: 'cpy312-pure-nocov (macos/arm64)'
python: '3.12'
toxpython: 'python3.12'
python_arch: 'x64'
python_arch: 'arm64'
tox_env: 'cpy312-pure-nocov'
cibw_arch: 'arm64'
cibw_build: false
Expand All @@ -933,7 +933,7 @@ jobs:
- name: 'cpy312-cython-cover (macos/arm64)'
python: '3.12'
toxpython: 'python3.12'
python_arch: 'x64'
python_arch: 'arm64'
tox_env: 'cpy312-cython-cover'
cover: true
cibw_arch: 'arm64'
Expand Down Expand Up @@ -990,7 +990,7 @@ jobs:
- name: 'cpy312-cython-nocov (macos/arm64)'
python: '3.12'
toxpython: 'python3.12'
python_arch: 'x64'
python_arch: 'arm64'
tox_env: 'cpy312-cython-nocov'
cibw_arch: 'arm64'
cibw_build: 'cp312-*'
Expand Down
2 changes: 1 addition & 1 deletion ci/templates/.github/workflows/github-actions.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
['ubuntu', 'x64', 'aarch64', '*musllinux*', False],
['windows', 'x64', 'AMD64', '*', True],
['windows', 'x86', 'x86', '*', False],
['macos', 'x64', 'arm64', '*', True],
['macos', 'arm64', 'arm64', '*', True],
] %}
{% if include_cover or (env.endswith('cython-nocov') and not prefix.startswith('pypy')) %}
{% set wheel_suffix = env.endswith('cython-nocov') and wheel_arch.strip('*') %}
Expand Down

0 comments on commit a15697d

Please sign in to comment.