Skip to content

Commit 9f661ff

Browse files
authored
fix(ci): Fix macos tests, support both Intel and Apple Silicon testing (abetlen#2150)
* fix(ci): use supported macos runner label * fix(ci): add apple silicon macos test coverage * fix(ci): run standard macos tests on apple silicon * fix(ci): simplify apple silicon macos install * fix(ci): disable ggml native on apple silicon runner * docs: update changelog for macos ci runner fix
1 parent ca3b00a commit 9f661ff

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/test.yaml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
9797
build-macos:
9898
needs: download-model
99-
runs-on: macos-13
99+
runs-on: macos-15
100100
strategy:
101101
matrix:
102102
python-version: ["3.9", "3.10", "3.11", "3.12"]
@@ -127,17 +127,16 @@ jobs:
127127
run: |
128128
python3 -m pip install --upgrade pip
129129
python3 -m pip install uv
130-
python3 -m uv pip install -e .[all] --verbose
131-
CMAKE_ARGS="-DLLAMA_METAL=off" python3 -m uv pip install .[all] --verbose
130+
CMAKE_ARGS="-DGGML_NATIVE=off" python3 -m uv pip install -e .[all] --verbose
132131
shell: bash
133132

134133
- name: Test with pytest
135134
run: |
136135
python3 -m pytest
137136
138-
build-macos-metal:
137+
build-macos-intel:
139138
needs: download-model
140-
runs-on: macos-13
139+
runs-on: macos-15-intel
141140
steps:
142141
- uses: actions/checkout@v4
143142
with:
@@ -163,7 +162,7 @@ jobs:
163162
- name: Install dependencies
164163
run: |
165164
python3 -m pip install --upgrade pip
166-
CMAKE_ARGS="-DLLAMA_METAL=on" python3 -m pip install .[all] --verbose
165+
python3 -m pip install .[all] --verbose
167166
shell: bash
168167

169168
- name: Test with pytest

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
- fix(ci): Run macOS CI on supported Apple Silicon and Intel runners by @abetlen in #2150
1011
- fix(ci): Use the `hf` CLI instead of the deprecated `huggingface-cli` name in GitHub Actions and docs by @abetlen in #2149
1112

1213
## [0.3.16]

0 commit comments

Comments
 (0)