Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CirrusCI fixes #1786

Merged
merged 4 commits into from
Mar 11, 2024
Merged

CirrusCI fixes #1786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cb46a27
Fix executable name, that doesn't always exist on windows
joerick Mar 11, 2024
b0186be
Use the `python3` executable on macOS Cirrus
joerick Mar 11, 2024
e0f9c7d
Homebrew changed where it puts the python binaries
joerick Mar 11, 2024
6224bb2
Update examples to match new config
joerick Mar 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
only_if: changesInclude('.cirrus.yml') || ($BRANCH == "main" && !changesIncludeOnly('docs/*', '.pre-commit-config.yaml'))
only_if: changesInclude('.cirrus.yml') || ($CIRRUS_BRANCH == "main" && !changesIncludeOnly('docs/*', '.pre-commit-config.yaml')) || $CIRRUS_BRANCH =~ 'cirrus.*'

run_tests: &RUN_TESTS
install_cibuildwheel_script:
Expand Down Expand Up @@ -50,25 +50,23 @@ windows_x86_task:

macos_arm64_task:
macos_instance:
image: ghcr.io/cirruslabs/macos-monterey-xcode
image: ghcr.io/cirruslabs/macos-sonoma-xcode

env:
PATH: /opt/homebrew/opt/[email protected]/bin:$PATH
PATH: /opt/homebrew/opt/[email protected]/libexec/bin:$PATH
install_pre_requirements_script:
- brew install [email protected]
- ln -s python3 /opt/homebrew/opt/[email protected]/bin/python
<<: *RUN_TESTS

macos_arm64_cp38_task:
macos_instance:
image: ghcr.io/cirruslabs/macos-monterey-xcode
image: ghcr.io/cirruslabs/macos-sonoma-xcode

env:
PATH: /opt/homebrew/opt/[email protected]/bin:$PATH
PATH: /opt/homebrew/opt/[email protected]/libexec/bin:$PATH
PYTEST_ADDOPTS: --run-cp38-universal2 -k 'test_cp38_arm64_testing_universal2_installer or test_arch_auto'
install_pre_requirements_script:
- brew install [email protected]
- ln -s python3 /opt/homebrew/opt/[email protected]/bin/python
- curl -fsSLO https://www.python.org/ftp/python/3.8.10/python-3.8.10-macos11.pkg
- sudo installer -pkg python-3.8.10-macos11.pkg -target /
- rm python-3.8.10-macos11.pkg
Expand Down
5 changes: 2 additions & 3 deletions examples/cirrus-ci-intel-mac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS
macos_task:
name: Build macOS x86_64 and arm64 wheels.
macos_instance:
image: ghcr.io/cirruslabs/macos-monterey-xcode
image: ghcr.io/cirruslabs/macos-sonoma-xcode

env:
PATH: /opt/homebrew/opt/[email protected]/bin:$PATH
PATH: /opt/homebrew/opt/[email protected]/libexec/bin:$PATH
CIBW_ARCHS_MACOS: x86_64 arm64
install_pre_requirements_script:
- brew install [email protected]
- ln -s python3 /opt/homebrew/opt/[email protected]/bin/python
<<: *BUILD_AND_STORE_WHEELS
5 changes: 2 additions & 3 deletions examples/cirrus-ci-minimal.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,10 @@ windows_x86_task:
macos_arm64_task:
name: Build macOS arm64 wheels.
macos_instance:
image: ghcr.io/cirruslabs/macos-monterey-xcode
image: ghcr.io/cirruslabs/macos-sonoma-xcode

env:
PATH: /opt/homebrew/opt/[email protected]/bin:$PATH
PATH: /opt/homebrew/opt/[email protected]/libexec/bin:$PATH
install_pre_requirements_script:
- brew install [email protected]
- ln -s python3 /opt/homebrew/opt/[email protected]/bin/python
<<: *BUILD_AND_STORE_WHEELS
2 changes: 1 addition & 1 deletion test/test_from_sdist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def test_simple(tmp_path):
assert os.path.exists('{package}/setup.py')
""",
)
setup_py_assertion_cmd = f'python3 -c "{setup_py_assertion_snippet !s}"'
setup_py_assertion_cmd = f'python -c "{setup_py_assertion_snippet !s}"'

# build the wheels from sdist
actual_wheels = cibuildwheel_from_sdist_run(
Expand Down
Loading