Skip to content

Commit

Permalink
looks like github is now rolling out arm64 macos workers so cached ve…
Browse files Browse the repository at this point in the history
…rsions of cspice were failing. may require further changes on ci build wheel side to run tests on macos, can also disable macos builds on cirrus ci which I don't actually use at all... but maybe should for arm linux
  • Loading branch information
AndrewAnnex committed Apr 26, 2024
1 parent 02f66af commit e48438d
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 18 deletions.
12 changes: 0 additions & 12 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,3 @@ linux_aarch64_task:
install_pre_requirements_script:
- apt install -y python3-venv python-is-python3
<<: *BUILD_AND_STORE_WHEELS

macos_arm64_task:
name: Build macOS arm64 wheels.
macos_instance:
image: ghcr.io/cirruslabs/macos-monterey-xcode

env:
PATH: /opt/homebrew/opt/python@3.11/bin:$PATH
install_pre_requirements_script:
- brew install python@3.11
- ln -s python3 /opt/homebrew/opt/python@3.11/bin/python
<<: *BUILD_AND_STORE_WHEELS
6 changes: 3 additions & 3 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ on:
env:
# increment to rebuild cspice manually
CSPICE_VERSION: 67
CSPICE_CACHE_NUMBER: 0
CSPICE_CACHE_NUMBER: 1

jobs:
build:
name: Build libcspice 🌶️ 📚
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-latest, macos-14, windows-latest]
steps:
- name: Look for cached libcspice 🌶️ 📚
id: cache-libcspice
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-latest, macos-14, windows-latest]
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12' ]
steps:
- name: Checkout 🌶️ 🥧
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish-to-test-and-live-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ jobs:
include:
- config: {"name": "Linux", "os": "ubuntu-latest", "arch": "x86_64"}
- config: {"name": "Linux", "os": "ubuntu-latest", "arch": "aarch64"}
- config: {"name": "macOS", "os": "macos-latest", "arch": "x86_64"}
- config: {"name": "macOS", "os": "macos-latest", "arch": "arm64"}
- config: {"name": "macOS", "os": "macos-14", "arch": "x86_64"}
- config: {"name": "macOS", "os": "macos-14", "arch": "arm64"}
- config: {"name": "Windows", "os": "windows-latest", "arch": "AMD64"}
name: Build SpiceyPy 🌶️ 🥧 Python 🐍 wheels for ${{ matrix.config.os }} ${{ matrix.config.arch }}
env:
CSPICE_CACHE: 0
CSPICE_CACHE: 1
CIBW_ARCHS: ${{ matrix.config.arch }}
runs-on: ${{ matrix.config.os }}
steps:
Expand Down

0 comments on commit e48438d

Please sign in to comment.