Merge branch 'main' into fix-watch-os-preview-build

siteline · Oct 27, 2023 · 856fe99 · 856fe99
2 parents 32f032f + 271b238
commit 856fe99
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -50,7 +50,7 @@ jobs:
           - platform: [iOS, 15]
             runtime: iOS 15.5
             os: macos-13
-            xcode: 15.0
+            xcode: 15.0.1
             install: true
           - platform: [iOS, 16]
             runtime: iOS 16.4
@@ -59,7 +59,7 @@ jobs:
           - platform: [iOS, 17]
             runtime: iOS 17.0
             os: macos-13
-            xcode: 15.0
+            xcode: 15.0.1
 
           - platform: [tvOS, 13]
             runtime: tvOS 13.4
@@ -74,16 +74,16 @@ jobs:
           - platform: [tvOS, 15]
             runtime: tvOS 15.4
             os: macos-13
-            xcode: 15.0
+            xcode: 15.0.1
             install: true
           - platform: [tvOS, 16]
             runtime: tvOS 16.4
             os: macos-13
-            xcode: 15.0
+            xcode: 15.0.1
           - platform: [tvOS, 17]
             runtime: tvOS 17.0
             os: macos-13
-            xcode: 15.0
+            xcode: 15.0.1
 
           - platform: [watchOS, 7]
             runtime: watchOS 7.4
@@ -111,7 +111,7 @@ jobs:
           - platform: [macOS, 13]
             runtime: macOS 13
             os: macos-13
-            xcode: 15.0
+            xcode: 15.0.1
 
           # FIXME: this currently hangs on CI
           # - platform: [visionos, 1]

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -6,7 +6,7 @@ devices = {
         14 => ["iPhone 12 (14.5)", "iPad Pro (9.7-inch) (14.5)"],
         15 => ["iPhone SE (3rd generation) (15.5)", "iPad Air (5th generation) (15.5)",],
         16 => ["iPhone 14 (16.4)", "iPad Pro (11-inch) (4th generation) (16.4)"],
-        17 => ["iPhone 14 (17.0)", "iPad Pro (11-inch) (4th generation) (17.0)"],
+        17 => ["iPhone 14 (17.0.1)", "iPad Pro (11-inch) (4th generation) (17.0.1)"],
     },
     "tvos" => {
         13 => ["Apple TV (13.4)"],