From c42f5f22ff51274c7f33d2ceeab8be6367e67221 Mon Sep 17 00:00:00 2001 From: abetlen Date: Sun, 22 Mar 2026 15:24:27 -0700 Subject: [PATCH 1/6] fix(ci): use supported macos runner label --- .github/workflows/test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 1d2b1983c..853b4cecd 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -96,7 +96,7 @@ jobs: build-macos: needs: download-model - runs-on: macos-13 + runs-on: macos-15-intel strategy: matrix: python-version: ["3.9", "3.10", "3.11", "3.12"] @@ -137,7 +137,7 @@ jobs: build-macos-metal: needs: download-model - runs-on: macos-13 + runs-on: macos-15-intel steps: - uses: actions/checkout@v4 with: From b1a8a615cd4a96d742bb4f279b242c24d0e0c516 Mon Sep 17 00:00:00 2001 From: abetlen Date: Sun, 22 Mar 2026 15:27:08 -0700 Subject: [PATCH 2/6] fix(ci): add apple silicon macos test coverage --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 853b4cecd..20e71c68f 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -137,7 +137,7 @@ jobs: build-macos-metal: needs: download-model - runs-on: macos-15-intel + runs-on: macos-15 steps: - uses: actions/checkout@v4 with: From 9193ac640271897b2703b73589acd9188a11d929 Mon Sep 17 00:00:00 2001 From: abetlen Date: Sun, 22 Mar 2026 15:32:55 -0700 Subject: [PATCH 3/6] fix(ci): run standard macos tests on apple silicon --- .github/workflows/test.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 20e71c68f..75baaf74f 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -96,7 +96,7 @@ jobs: build-macos: needs: download-model - runs-on: macos-15-intel + runs-on: macos-15 strategy: matrix: python-version: ["3.9", "3.10", "3.11", "3.12"] @@ -128,16 +128,16 @@ jobs: python3 -m pip install --upgrade pip python3 -m pip install uv python3 -m uv pip install -e .[all] --verbose - CMAKE_ARGS="-DLLAMA_METAL=off" python3 -m uv pip install .[all] --verbose + CMAKE_ARGS="-DGGML_METAL=on" python3 -m uv pip install .[all] --verbose shell: bash - name: Test with pytest run: | python3 -m pytest - build-macos-metal: + build-macos-intel: needs: download-model - runs-on: macos-15 + runs-on: macos-15-intel steps: - uses: actions/checkout@v4 with: @@ -163,7 +163,7 @@ jobs: - name: Install dependencies run: | python3 -m pip install --upgrade pip - CMAKE_ARGS="-DLLAMA_METAL=on" python3 -m pip install .[all] --verbose + python3 -m pip install .[all] --verbose shell: bash - name: Test with pytest From 4dd4681441b621b2fb3da76ebece475b06c9361c Mon Sep 17 00:00:00 2001 From: abetlen Date: Sun, 22 Mar 2026 15:36:40 -0700 Subject: [PATCH 4/6] fix(ci): simplify apple silicon macos install --- .github/workflows/test.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 75baaf74f..e3718fc76 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -128,7 +128,6 @@ jobs: python3 -m pip install --upgrade pip python3 -m pip install uv python3 -m uv pip install -e .[all] --verbose - CMAKE_ARGS="-DGGML_METAL=on" python3 -m uv pip install .[all] --verbose shell: bash - name: Test with pytest From 1df6963525be3526710d255a0d100ab5c0c046dd Mon Sep 17 00:00:00 2001 From: abetlen Date: Sun, 22 Mar 2026 15:51:06 -0700 Subject: [PATCH 5/6] fix(ci): disable ggml native on apple silicon runner --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index e3718fc76..af4cacac4 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -127,7 +127,7 @@ jobs: run: | python3 -m pip install --upgrade pip python3 -m pip install uv - python3 -m uv pip install -e .[all] --verbose + CMAKE_ARGS="-DGGML_NATIVE=off" python3 -m uv pip install -e .[all] --verbose shell: bash - name: Test with pytest From 39c1c7fd511a74d4c664bc71d545bbf47e7c2b73 Mon Sep 17 00:00:00 2001 From: abetlen Date: Sun, 22 Mar 2026 16:06:53 -0700 Subject: [PATCH 6/6] docs: update changelog for macos ci runner fix --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f577c1a4..9bc1c9a0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +- fix(ci): Run macOS CI on supported Apple Silicon and Intel runners by @abetlen in #2150 - fix(ci): Use the `hf` CLI instead of the deprecated `huggingface-cli` name in GitHub Actions and docs by @abetlen in #2149 ## [0.3.16]