更新 CI 配置

Author: bitnpc

.github/workflows/ci.yml

@@ -46,6 +46,8 @@ jobs:
 
       - name: Run Fastlane CI lane
         env:
+          CI: true
+          GITHUB_ACTIONS: true
           LC_ALL: en_US.UTF-8
           LANG: en_US.UTF-8
           FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT: 60

fastlane/Fastfile

@@ -34,19 +34,36 @@ def find_ios_simulator
 end
 
 # 辅助方法：获取构建 destination
-def get_build_destination(boot_simulator: false)
+def get_build_destination(boot_simulator: false, prefer_generic: false)
+  # 如果偏好使用通用 destination，直接返回
+  if prefer_generic
+    UI.important("Using generic iOS Simulator destination")
+    return "platform=iOS Simulator"
+  end
+  
   simulator = find_ios_simulator
 
   if simulator
     if boot_simulator
       UI.message("Booting simulator: #{simulator[:name]} (#{simulator[:udid]})")
-      `xcrun simctl boot "#{simulator[:udid]}" 2>&1`
+      boot_result = `xcrun simctl boot "#{simulator[:udid]}" 2>&1`
+      unless $?.success?
+        UI.important("Failed to boot simulator, may already be booted: #{boot_result}")
+      end
       sleep(5)
     end
-    "platform=iOS Simulator,id=#{simulator[:udid]}"
+    
+    # 验证模拟器是否存在
+    device_list = `xcrun simctl list devices 2>&1`
+    if device_list.include?(simulator[:udid])
+      "platform=iOS Simulator,id=#{simulator[:udid]}"
+    else
+      UI.important("Simulator #{simulator[:udid]} not found, using name-based destination")
+      "platform=iOS Simulator,name=#{simulator[:name]}"
+    end
   else
     UI.important("No available iPhone simulator found, using generic iOS Simulator")
-    "platform=iOS Simulator,name=iPhone 15 Pro"
+    "platform=iOS Simulator"
   end
 end
 
@@ -79,10 +96,37 @@ platform :ios do
     if !has_test_action
       UI.important("No test action configured in scheme, skipping tests and just building the project")
 
-      destination = get_build_destination(boot_simulator: false)
+      # 在 CI 环境中，优先使用通用 destination 以避免模拟器 ID 问题
+      is_ci = ENV["CI"] == "true" || ENV["GITHUB_ACTIONS"] == "true"
+      destination = get_build_destination(boot_simulator: false, prefer_generic: is_ci)
 
       Dir.chdir(project_root) do
-        sh("xcodebuild clean build -project Smth.xcodeproj -scheme Smth -destination '#{destination}' -sdk iphonesimulator -skipPackagePluginValidation")
+        # 尝试构建，如果失败则使用更通用的 destination
+        build_success = false
+        attempts = [
+          destination,
+          "platform=iOS Simulator",
+          "generic/platform=iOS Simulator"
+        ].uniq
+        
+        attempts.each_with_index do |dest, index|
+          begin
+            UI.message("Build attempt #{index + 1}/#{attempts.length} with destination: #{dest}")
+            sh("xcodebuild clean build -project Smth.xcodeproj -scheme Smth -destination '#{dest}' -sdk iphonesimulator -skipPackagePluginValidation")
+            build_success = true
+            break
+          rescue => ex
+            if index < attempts.length - 1
+              UI.important("Build failed with destination '#{dest}', trying next: #{ex.message}")
+            else
+              UI.user_error!("All build attempts failed. Last error: #{ex.message}")
+            end
+          end
+        end
+        
+        unless build_success
+          UI.user_error!("Failed to build project after #{attempts.length} attempts")
+        end
       end
 
       UI.success("Build completed successfully (no tests to run)")