From 6723c1e62ffe80ad56303644045515afdac9d4b5 Mon Sep 17 00:00:00 2001 From: Isaac Lins Date: Fri, 19 Dec 2025 02:02:28 +0100 Subject: [PATCH 1/2] fix: Add Xcode selection step to CI jobs for macOS 26 --- .github/workflows/ci.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 00181ec..70fe5eb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,9 +57,16 @@ jobs: runs-on: macos-26 needs: docs-filter if: (github.ref == 'refs/heads/dev' || github.base_ref == 'dev') && needs.docs-filter.outputs.docs_only != 'true' + env: + DEVELOPER_DIR: /Applications/Xcode_26.0.app/Contents/Developer steps: - uses: actions/checkout@v4 + - name: Select Xcode 26 + run: | + sudo xcode-select -s /Applications/Xcode_26.0.app + xcodebuild -version + - name: Run quick tests (FAST_TESTS=1) run: FAST_TESTS=1 make quicktest @@ -76,9 +83,16 @@ jobs: runs-on: macos-26 needs: docs-filter if: needs.docs-filter.outputs.docs_only != 'true' + env: + DEVELOPER_DIR: /Applications/Xcode_26.0.app/Contents/Developer steps: - uses: actions/checkout@v4 + - name: Select Xcode 26 + run: | + sudo xcode-select -s /Applications/Xcode_26.0.app + xcodebuild -version + - name: Run unit tests run: make unit-test @@ -95,9 +109,16 @@ jobs: runs-on: macos-26 needs: docs-filter if: (github.ref == 'refs/heads/main' || github.event_name == 'pull_request') && needs.docs-filter.outputs.docs_only != 'true' + env: + DEVELOPER_DIR: /Applications/Xcode_26.0.app/Contents/Developer steps: - uses: actions/checkout@v4 + - name: Select Xcode 26 + run: | + sudo xcode-select -s /Applications/Xcode_26.0.app + xcodebuild -version + - name: Build run: make build @@ -117,9 +138,16 @@ jobs: runs-on: macos-26 needs: docs-filter if: (github.ref == 'refs/heads/main' || github.event_name == 'pull_request') && needs.docs-filter.outputs.docs_only != 'true' + env: + DEVELOPER_DIR: /Applications/Xcode_26.0.app/Contents/Developer steps: - uses: actions/checkout@v4 + - name: Select Xcode 26 + run: | + sudo xcode-select -s /Applications/Xcode_26.0.app + xcodebuild -version + - name: Run performance tests run: make perf || true From 0b98f07b2af8fde627a9fbe8b9c0830b61ef02e1 Mon Sep 17 00:00:00 2001 From: Isaac Lins Date: Fri, 19 Dec 2025 02:05:36 +0100 Subject: [PATCH 2/2] fix: Update CI workflow to use macOS 15 and Xcode 26.0.1 --- .github/workflows/ci.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 70fe5eb..cf9e1b7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -54,17 +54,17 @@ jobs: quicktests: name: Quick Tests (FAST_TESTS) - runs-on: macos-26 + runs-on: macos-15 needs: docs-filter if: (github.ref == 'refs/heads/dev' || github.base_ref == 'dev') && needs.docs-filter.outputs.docs_only != 'true' env: - DEVELOPER_DIR: /Applications/Xcode_26.0.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode_26.0.1.app/Contents/Developer steps: - uses: actions/checkout@v4 - - name: Select Xcode 26 + - name: Select Xcode 26.0.1 run: | - sudo xcode-select -s /Applications/Xcode_26.0.app + sudo xcode-select -s /Applications/Xcode_26.0.1.app xcodebuild -version - name: Run quick tests (FAST_TESTS=1) @@ -80,17 +80,17 @@ jobs: unit-tests: name: Unit Tests - runs-on: macos-26 + runs-on: macos-15 needs: docs-filter if: needs.docs-filter.outputs.docs_only != 'true' env: - DEVELOPER_DIR: /Applications/Xcode_26.0.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode_26.0.1.app/Contents/Developer steps: - uses: actions/checkout@v4 - - name: Select Xcode 26 + - name: Select Xcode 26.0.1 run: | - sudo xcode-select -s /Applications/Xcode_26.0.app + sudo xcode-select -s /Applications/Xcode_26.0.1.app xcodebuild -version - name: Run unit tests @@ -106,17 +106,17 @@ jobs: build-and-archive: name: Build & Archive - runs-on: macos-26 + runs-on: macos-15 needs: docs-filter if: (github.ref == 'refs/heads/main' || github.event_name == 'pull_request') && needs.docs-filter.outputs.docs_only != 'true' env: - DEVELOPER_DIR: /Applications/Xcode_26.0.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode_26.0.1.app/Contents/Developer steps: - uses: actions/checkout@v4 - - name: Select Xcode 26 + - name: Select Xcode 26.0.1 run: | - sudo xcode-select -s /Applications/Xcode_26.0.app + sudo xcode-select -s /Applications/Xcode_26.0.1.app xcodebuild -version - name: Build @@ -135,17 +135,17 @@ jobs: performance-tests: name: Performance Tests - runs-on: macos-26 + runs-on: macos-15 needs: docs-filter if: (github.ref == 'refs/heads/main' || github.event_name == 'pull_request') && needs.docs-filter.outputs.docs_only != 'true' env: - DEVELOPER_DIR: /Applications/Xcode_26.0.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode_26.0.1.app/Contents/Developer steps: - uses: actions/checkout@v4 - - name: Select Xcode 26 + - name: Select Xcode 26.0.1 run: | - sudo xcode-select -s /Applications/Xcode_26.0.app + sudo xcode-select -s /Applications/Xcode_26.0.1.app xcodebuild -version - name: Run performance tests