From 0e1bff4b58d062dfc17eae6c262b802e32329fdc Mon Sep 17 00:00:00 2001 From: Innei Date: Thu, 24 Jul 2025 22:30:07 +0800 Subject: [PATCH] chore: update Xcode version to 16.4 and adjust macOS runner labels in workflows - Changed default Xcode version in setup action to 16.4. - Updated macOS runner labels from 'macos-latest' and 'macos-15' to 'macos-16' in multiple workflows for consistency. Signed-off-by: Innei --- .github/actions/setup-xcode/action.yml | 8 ++++---- .github/workflows/build-desktop.yml | 2 +- .github/workflows/build-ios-development.yml | 8 ++++---- .github/workflows/build-ios.yml | 11 ++++------- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/.github/actions/setup-xcode/action.yml b/.github/actions/setup-xcode/action.yml index d3e106507..c534d5202 100644 --- a/.github/actions/setup-xcode/action.yml +++ b/.github/actions/setup-xcode/action.yml @@ -4,11 +4,11 @@ inputs: xcode-version: description: "Xcode version to use" required: false - default: "16.3" + default: "16.4" runs: using: "composite" steps: - - name: Use Xcode ${{ inputs.xcode-version }} - shell: bash - run: sudo xcode-select -s /Applications/Xcode_${{ inputs.xcode-version }}.app + - uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: ${{ inputs.xcode-version }} diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml index d13502e41..c4c1412af 100644 --- a/.github/workflows/build-desktop.yml +++ b/.github/workflows/build-desktop.yml @@ -45,7 +45,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, ubuntu-latest, windows-latest] + os: [macos-16, ubuntu-latest, windows-latest] exclude: - os: ${{ github.event.inputs.store == 'true' && 'ubuntu-latest' }} diff --git a/.github/workflows/build-ios-development.yml b/.github/workflows/build-ios-development.yml index cb4ef3e8d..8f2e595f4 100644 --- a/.github/workflows/build-ios-development.yml +++ b/.github/workflows/build-ios-development.yml @@ -29,7 +29,7 @@ jobs: if [ -n "$available" ]; then echo "runner-label=self-hosted" >> $GITHUB_OUTPUT else - echo "runner-label=macos-15" >> $GITHUB_OUTPUT + echo "runner-label=macos-16" >> $GITHUB_OUTPUT fi build-ipa-device-self-hosted: @@ -71,9 +71,9 @@ jobs: build-ipa-device-github: name: Build iOS IPA for device (GitHub-hosted) - if: github.secret_source != 'None' && needs.check-runner.outputs.runner-label == 'macos-15' + if: github.secret_source != 'None' && needs.check-runner.outputs.runner-label == 'macos-16' needs: check-runner - runs-on: macos-15 + runs-on: macos-16 steps: - name: 📦 Checkout code @@ -117,7 +117,7 @@ jobs: build-simulator: name: Build iOS IPA for simulator if: github.secret_source != 'None' - runs-on: macos-15 + runs-on: macos-16 steps: - name: 📦 Checkout code diff --git a/.github/workflows/build-ios.yml b/.github/workflows/build-ios.yml index c06cae59d..c810f7737 100644 --- a/.github/workflows/build-ios.yml +++ b/.github/workflows/build-ios.yml @@ -1,4 +1,4 @@ -name: 🍎 Build iOS +name: Build iOS on: push: @@ -36,7 +36,7 @@ jobs: if [ -n "$available" ]; then echo "runner-label=self-hosted" >> $GITHUB_OUTPUT else - echo "runner-label=macos-latest" >> $GITHUB_OUTPUT + echo "runner-label=macos-16" >> $GITHUB_OUTPUT fi build-ipa-self-hosted: @@ -83,17 +83,14 @@ jobs: build-ipa-github: name: Build iOS IPA (GitHub) - if: github.secret_source != 'None' && needs.check-runner.outputs.runner-label == 'macos-latest' + if: github.secret_source != 'None' && needs.check-runner.outputs.runner-label == 'macos-16' needs: check-runner - runs-on: macos-latest + runs-on: macos-16 steps: - name: 📦 Checkout code uses: actions/checkout@v4 - - name: 🔧 Setup Xcode - uses: ./.github/actions/setup-xcode - - name: 📦 Setup pnpm uses: pnpm/action-setup@v4