Merge pull request #2320 from onevcat/fix/ci-os-version

Fix CI OS version
onevcat · Nov 19, 2024 · a1e10bc · a1e10bc
2 parents 6d8b529 + fe04c34
commit a1e10bc
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 21 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -7,20 +7,19 @@ defaults:
 on: [push, pull_request]
 
 concurrency:
-  group: ${{ github.head_ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
   build-framework:
     runs-on: self-hosted
-    continue-on-error: true
     strategy:
       matrix:
         destination: [
           'macOS', 
-          'iOS Simulator,name=iPhone 15', 
-          'tvOS Simulator,name=Apple TV', 
-          'watchOS Simulator,name=Apple Watch Series 9 (41mm)'
+          'iOS Simulator,name=iPhone 15,OS=17.5', 
+          'tvOS Simulator,name=Apple TV,OS=17.5', 
+          'watchOS Simulator,name=Apple Watch Series 9 (41mm),OS=10.5'
         ]
         xcode: [
           '15.2',

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -7,20 +7,19 @@ defaults:
 on: [push, pull_request]
 
 concurrency:
-  group: ${{ github.head_ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
   run-tests:
     runs-on: self-hosted
-    continue-on-error: true
     strategy:
       matrix:
         destination: [
           'macOS', 
-          'iOS Simulator,name=iPhone 15', 
-          'tvOS Simulator,name=Apple TV', 
-          'watchOS Simulator,name=Apple Watch Series 9 (41mm)'
+          'iOS Simulator,name=iPhone 15,OS=17.5', 
+          'tvOS Simulator,name=Apple TV,OS=17.5', 
+          'watchOS Simulator,name=Apple Watch Series 9 (41mm),OS=10.5'
         ]
         xcode: [
           '15.4',

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -25,16 +25,16 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.1003.0)
-    aws-sdk-core (3.212.0)
+    aws-partitions (1.1009.0)
+    aws-sdk-core (3.213.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.95.0)
+    aws-sdk-kms (1.96.0)
       aws-sdk-core (~> 3, >= 3.210.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.170.0)
+    aws-sdk-s3 (1.172.0)
       aws-sdk-core (~> 3, >= 3.210.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -219,7 +219,7 @@ GEM
     i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     jmespath (1.6.2)
-    json (2.8.1)
+    json (2.8.2)
     jwt (2.9.3)
       base64
     logger (1.6.1)
@@ -249,7 +249,7 @@ GEM
     ruby-macho (2.5.1)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
-    securerandom (0.3.1)
+    securerandom (0.3.2)
     security (0.1.5)
     signet (0.19.0)
       addressable (~> 2.8)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -7,9 +7,9 @@ platform :ios do
   desc "Runs all the tests"
   lane :tests do
     test(destination: "platform=macOS")
-    test(destination: "platform=iOS Simulator,name=iPhone 15")
-    test(destination: "platform=tvOS Simulator,name=Apple TV")
-    build(destination: "platform=watchOS Simulator,name=Apple Watch Series 9 (41mm)")
+    test(destination: "platform=iOS Simulator,name=iPhone 15,OS=17.5")
+    test(destination: "platform=tvOS Simulator,name=Apple TV,OS=17.5")
+    build(destination: "platform=watchOS Simulator,name=Apple Watch Series 9 (41mm),OS=10.5")
   end
 
   lane :test_ci do
@@ -92,7 +92,7 @@ platform :ios do
     target_version = "Kingfisher-#{options[:version]}"
 
     swift_version = options[:swift_version] || "5.0"
-    xcode_version = options[:xcode_version] || "16.0"
+    xcode_version = options[:xcode_version] || "16.1"
 
     xcodes(version: xcode_version, select_for_current_build_only: true)
 
@@ -142,7 +142,7 @@ platform :ios do
   end
 
   before_all do |lane|
-    xcode_version = ENV["XCODE_VERSION"] || "16.0"
+    xcode_version = ENV["XCODE_VERSION"] || "16.1"
     xcodes(version: xcode_version, select_for_current_build_only: true)
   end