From 9a1a1c93ba7ca06b45f997ad7e3ea7a91db40af3 Mon Sep 17 00:00:00 2001 From: Hudson Cooper Date: Wed, 15 Jan 2025 12:15:47 -0800 Subject: [PATCH 1/2] Drop macos-14 runner as it's no longer x86 No need to use the macos-14 runner as it's not actually testing x86 anymore. Switching to just the macos-latest runner (silicon). --- .github/workflows/workflow-pr-gate.yml | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/.github/workflows/workflow-pr-gate.yml b/.github/workflows/workflow-pr-gate.yml index a1e3cfb70..f1ae74a65 100644 --- a/.github/workflows/workflow-pr-gate.yml +++ b/.github/workflows/workflow-pr-gate.yml @@ -14,7 +14,7 @@ jobs: bare-install: strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-14] + os: [ubuntu-latest, windows-latest, macos-latest] python-version: ["3.9", "3.10", "3.11", "3.12"] runs-on: ${{ matrix.os }} steps: @@ -113,28 +113,8 @@ jobs: # Third Stage ============================================================== # Windows and MacOS, plus other GPU Linux tests - - basic-tests-mac-x86: - needs: end-stage-2 - strategy: - fail-fast: false # Don't cancel all on first failure - matrix: - python-version: ["3.9", "3.10", "3.11", "3.12"] - model: - - "transformers_gpt2_cpu" - - "transformers_phi2_cpu" - # - "transformers_mistral_7b_cpu" See Issue 713 - - "llamacpp_llama2_7b_cpu" - - "llamacpp_mistral_7b_cpu" - # - "transformers_phi3_mini_4k_instruct_cpu" Gives trouble on MacOS - - "llamacpp_phi3_mini_4k_instruct_cpu" - uses: ./.github/workflows/action_plain_basic_tests.yml - with: - os: macos-14 - python-version: ${{ matrix.python-version }} - model: ${{ matrix.model }} - basic-tests-mac-arm: + basic-tests-mac: needs: end-stage-2 strategy: fail-fast: false # Don't cancel all on first failure From 2ee41b86f0f39c05d65cfe40df9f2ead1e429075 Mon Sep 17 00:00:00 2001 From: Hudson Cooper Date: Wed, 15 Jan 2025 12:20:13 -0800 Subject: [PATCH 2/2] furthermore stop building for macos-14 note that the x86_64 flag for macos-14 was actually incorrect --- .github/workflows/pypi_upload.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/pypi_upload.yml b/.github/workflows/pypi_upload.yml index e3fa04eac..a1029a08f 100644 --- a/.github/workflows/pypi_upload.yml +++ b/.github/workflows/pypi_upload.yml @@ -31,8 +31,6 @@ jobs: { cibuildwheel --print-build-identifiers --platform linux --archs x86_64 \ | jq -nRc '{"only": inputs, "os": "ubuntu-latest"}' \ - && cibuildwheel --print-build-identifiers --platform macos --archs x86_64 \ - | jq -nRc '{"only": inputs, "os": "macos-14"}' \ && cibuildwheel --print-build-identifiers --platform macos --archs arm64 \ | jq -nRc '{"only": inputs, "os": "macos-latest"}' \ && cibuildwheel --print-build-identifiers --platform windows --archs auto64 \