diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ce60bd25f..6dc37447b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -51,76 +51,64 @@ jobs: runtime: iOS 15.5 os: macos-15 xcode: 26.0 - install: true - platform: [iOS, 16] runtime: iOS 16.4 os: macos-15 xcode: 26.0 - install: true - platform: [iOS, 17] runtime: iOS 17.5 os: macos-15 xcode: 26.0 - install: true - platform: [iOS, 18] runtime: iOS 18.6 os: macos-15 xcode: 26.0 - install: false - # - platform: [iOS, 26] - # runtime: iOS 26.0 - # os: macos-15 - # xcode: 26.0 + - platform: [iOS, 26] + runtime: iOS 26.0 + os: macos-15 + xcode: 26.0 - platform: [tvOS, 15] runtime: tvOS 15.4 os: macos-15 xcode: 26.0 - install: true - platform: [tvOS, 16] runtime: tvOS 16.4 os: macos-15 xcode: 26.0 - install: true - platform: [tvOS, 17] runtime: tvOS 17.5 os: macos-15 xcode: 26.0 - install: true - platform: [tvOS, 18] runtime: tvOS 18.5 os: macos-15 xcode: 26.0 - install: false - # - platform: [tvOS, 26] - # runtime: tvOS 26.0 - # os: macos-15 - # xcode: 26.0 + - platform: [tvOS, 26] + runtime: tvOS 26.0 + os: macos-15 + xcode: 26.0 - platform: [watchOS, 8] runtime: watchOS 8.5 os: macos-15 xcode: 26.0 - install: true - platform: [watchOS, 9] runtime: watchOS 9.4 os: macos-15 xcode: 26.0 - install: true - platform: [watchOS, 10] runtime: watchOS 10.5 os: macos-15 xcode: 26.0 - install: true - platform: [watchOS, 11] runtime: watchOS 11.5 os: macos-15 xcode: 26.0 - install: false - # - platform: [watchOS, 26] - # runtime: watchOS 26.0 - # os: macos-15 - # xcode: 26.0 + - platform: [watchOS, 26] + runtime: watchOS 26.0 + os: macos-15 + xcode: 26.0 - platform: [macOS, 15] runtime: macOS 15 @@ -128,23 +116,21 @@ jobs: xcode: 26.0 # - platform: [macOS, 26] # runtime: macOS 26.0 - # os: macos-15 + # os: macos-26 # xcode: 26.0 - platform: [visionOS, 1] runtime: visionOS 1.2 os: macos-15 xcode: 26.0 - install: true - platform: [visionOS, 2] runtime: visionOS 2.5 os: macos-15 xcode: 26.0 - install: false - # - platform: [visionOS, 26] - # runtime: visionOS 26.0 - # os: macos-15 - # xcode: 26.0 + - platform: [visionOS, 26] + runtime: visionOS 26.0 + os: macos-15 + xcode: 26.0 steps: - name: Git Checkout uses: actions/checkout@v4 @@ -152,6 +138,15 @@ jobs: - name: Set environment variables run: echo "SKIP_SLOW_FASTLANE_WARNING=1" >> $GITHUB_ENV + - if: ${{ matrix.platform[0] != 'macOS' }} + name: Check for ${{ matrix.runtime }} runtime + run: | + if xcrun simctl list runtimes | grep -q "${{ matrix.runtime }}"; then + echo "has_runtime=true" >> "$GITHUB_ENV" + else + echo "has_runtime=false" >> "$GITHUB_ENV" + fi + - name: Select Xcode ${{ matrix.xcode }} run: sudo xcodes select ${{ matrix.xcode }} @@ -163,11 +158,11 @@ jobs: max_attempts: 3 command: xcodebuild -downloadPlatform ${{ matrix.platform[0] }} - - if: ${{ matrix.install }} + - if: env.has_runtime == 'false' name: "[Debug] List Available Installable Runtimes" run: xcodes runtimes --include-betas - - if: ${{ matrix.install }} + - if: env.has_runtime == 'false' name: Install Required Runtime (${{ matrix.runtime }}) uses: nick-fields/retry@v3 with: diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 9947fbd88..2375857e1 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -6,22 +6,26 @@ devices = { 16 => ["iPhone 14 (16.4)", "iPad Pro (11-inch) (4th generation) (16.4)"], 17 => ["iPhone 15 (17.5)", "iPad Pro 11-inch (M4) (17.5)"], 18 => ["iPhone 16 (18.6)", "iPad Pro 11-inch (M4) (18.6)"], + 26 => ["iPhone 16 (26.0)", "iPad Pro 11-inch (M4) (26.0)"], }, "tvos" => { 15 => ["Apple TV (15.4)"], 16 => ["Apple TV (16.4)"], 17 => ["Apple TV (17.5)"], 18 => ["Apple TV (18.5)"], + 26 => ["Apple TV (26.0)"], }, "watchos" => { 8 => ["Apple Watch Series 7 (45mm) (8.5)"], 9 => ["Apple Watch Series 8 (45mm) (9.4)"], 10 => ["Apple Watch Series 9 (45mm) (10.5)"], 11 => ["Apple Watch Series 10 (42mm) (11.5)"], + 26 => ["Apple Watch Series 10 (42mm) (26.0)"], }, "visionos" => { 1 => ["Apple Vision Pro (at 2732x2048) (1.2)"], 2 => ["Apple Vision Pro (2.5)"], + 26 => ["Apple Vision Pro (26.0)"], }, }