fastlane-plugin-fastci 0.0.7 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 447af26ce478afd41026dd66f1ffd04d787f081457db0da892491a022bca834e
-  data.tar.gz: 417c3bb7b9d6398e3905f5858e8082fb26bb7b22eeeb4ee3b0b8b6eacdaaf1dc
+  metadata.gz: 92cd2eecab7638219676828631ffb4ca3b81074629ce70e6e9eaf053e2778e99
+  data.tar.gz: f7d32780ee6b2582b7cd2a19bbfdf766627af508b9622526ed4185c311041cc8
 SHA512:
-  metadata.gz: 7dc8fc8efd8a487a8aec65b4b36c0877eb1f1a105404009d255764686f629db58f23e2de63e0780d963400c088318c99e9b9e87d04e13859ea7862e0e2ce2ac7
-  data.tar.gz: 73444092de1acb713030a91230943659730c5feeb48b6aa26222e0ae7fd1786443122018731067e8ffd3a2555e3e160016f29eb54778625e36fbac558c4e9981
+  metadata.gz: 1f93414a9ca171e561674ed6bfacb4a0e1aecb18514d24e2c812f19aa288a16d2e707c2474b98cd44f651fce23deb9debcffdfe3becb3f7d7bebd020924807e0
+  data.tar.gz: '0287e0c10faffe56b080040da482d45f0654264725a63ad09245114275bed2bba6b958c26791d200388d12d8c0f63fe92fee4a7e426f3ce1a075adafeebbdf89'

data/README.md

@@ -7,8 +7,6 @@
 简单快速的集成，5 分钟即可上手。
 配合 Jenkins 实现高度自定义。
 
-目前还在 Beta 测试阶段！！！
-
 ---
 
 ## 安装方法
@@ -28,8 +26,8 @@
 ## 使用方法
 
 参考 [` Fastfile `](fastlane/Fastfile) 和 [` .env.default `](fastlane/.env.default) 替换项目内 fastlane 文件夹下文件；
-项目根目录新建 ` PACKAGE_FILE_FOLDER_NAME ` 配置对应名字文件夹，将描述文件、证书、p8 密钥等文件放入该文件夹下。
-然后终端进入项目根目录就可以使用 ` fastlane `
+项目根目录新建 ` PACKAGE_FILE_FOLDER_NAME ` 配置对应名字文件夹，将描述文件、p12 证书、p8 密钥等文件放入该文件夹下。
+然后终端进入项目根目录即可使用 ` fastlane `
 
 
 ### 使用后会在项目根目录生成文件夹
@@ -49,7 +47,7 @@ fastlane_cache/ # 插件缓存文件夹
 
 ### 1. 自动打包
 功能：自动编译并导出 ipa 包，支持多种打包方式和集成多项检查。
-生成完的 ipa 会放在桌面上，非 ` app-store ` 配置了蒲公英或 fir 参数会自动上传蒲公英或 fir` app-store ` 配置了商店参数会自动上传商店。
+生成完的 ipa 会放在桌面上，非 ` app-store ` 配置了蒲公英或 fir 参数会自动上传蒲公英或 fir` app-store ` 和 ` testFlight ` 配置了商店参数会自动上传商店。
 
 ` build `: 不指定的话内部有递增逻辑，格式为 ` 20250905.15（日期+当天包的次数） `
 
@@ -58,13 +56,14 @@ fastlane_cache/ # 插件缓存文件夹
 ```ruby
 package(
 	configuration: "Debug", # 编译环境 Release/Debug
-	export_method: "development", # 打包方式 ad-hoc, enterprise, app-store, development
+	export_method: "development", # 打包方式 ad-hoc, enterprise, app-store, development, testFlight
 	version: nil, # 指定 version
 	build: nil, # 指定 build 号
 	is_analyze_swiftlint: false, # 是否代码分析
 	is_detect_duplicity_code: false, # 是否检测重复代码
 	is_detect_unused_code: false, # 是否检测未使用代码
-	is_detect_unused_image: false # 是否检测未使用图片
+	is_detect_unused_image: false, # 是否检测未使用图片
+	changelog: options[:changelog], # fir 更新日志
     release_notes: options[:release_notes] # 配合 jenkins 传参上传 appstore 格式为 { \"zh-Hans\": \"修复问题\", \"en-US\": \"bugfix\"} JSON 字符串 
 )
 ```

data/lib/fastlane/plugin/fastci/actions/package_action.rb

@@ -19,7 +19,7 @@ module Fastlane
         is_detect_unused_code = params[:is_detect_unused_code] || false
         is_detect_unused_image = params[:is_detect_unused_image] || false
         release_notes = params[:release_notes] || ""
-        if export_method == "app-store"
+        if export_method == "app-store" || export_method == "testFlight"
           configuration = "Release"
         end
 
@@ -32,7 +32,7 @@ module Fastlane
         # 安装 provisioningProfile
         other_action.install_profile()
 
-        scheme = Environment.scheme
+        scheme = params[:scheme] || Environment.scheme
 
         # 更改项目version
         other_action.increment_version_number(
@@ -47,7 +47,7 @@ module Fastlane
         version = Actions::GetVersionNumberAction.run(target: Environment.target)
         build = Actions::GetBuildNumberAction.run({})
         # 生成ipa包的名字格式
-        ipaName = "#{Environment.scheme}_#{export_method}_#{version}_#{build}.ipa"
+        ipaName = "#{scheme}_#{export_method}_#{version}_#{build}.ipa"
         
         # 获取 Extension 的 Bundle ID（可能有多个，用逗号分隔）
         extension_bundle_ids = Environment.extension_bundle_ids
@@ -62,7 +62,7 @@ module Fastlane
         when "ad-hoc"
           profile_name = Environment.provisioningProfiles_adhoc
           extension_profile_names = Environment.extension_profiles_adhoc
-        when "app-store"
+        when "app-store", "testFlight"
           profile_name = Environment.provisioningProfiles_appstore
           extension_profile_names = Environment.extension_profiles_appstore
         else
@@ -79,7 +79,10 @@ module Fastlane
 
         UI.message("*************| 开始打包 |*************")
 
-        other_action.gym(
+        # 对于 testFlight，使用 app-store 方法
+        gym_method = export_method == "testFlight" ? "app-store" : export_method
+        
+        gym_options = {
           clean: true,
           silent: true,
           workspace: Environment.workspace,
@@ -89,10 +92,17 @@ module Fastlane
           output_name: ipaName,
           output_directory: Constants.IPA_OUTPUT_DIR,
           export_options: {
-            method: export_method,
-            provisioningProfiles: provisioningProfiles_map
+            method: gym_method
           }
-        )
+        }
+
+        if Environment.is_auto_update_provisioning
+          gym_options[:xcargs] = '-allowProvisioningUpdates'
+        else
+          gym_options[:export_options][:provisioningProfiles] = provisioningProfiles_map
+        end
+
+        other_action.gym(gym_options)
 
         UI.message("*************| 打包完成 |*************")
 
@@ -114,13 +124,18 @@ module Fastlane
 
         ipa_path = "#{Constants.IPA_OUTPUT_DIR}/#{ipaName}"
 
-        if export_method == "app-store"
+        if export_method == "app-store" || export_method == "testFlight"
           notiText = "🚀🚀🚀🚀🚀🚀\n\n#{scheme}-iOS-打包完成\n\n#{version}_#{build}_#{export_method}\n\n🚀🚀🚀🚀🚀🚀"
           DingdingHelper.sendMarkdown(notiText)
 
           if CommonHelper.is_validate_string(Environment.connect_key_id) && CommonHelper.is_validate_string(Environment.connect_issuer_id)
-
-            other_action.upload_store(release_notes: release_notes)
+            # 根据 export_method 决定是否为 TestFlight
+            is_test_flight = export_method == "testFlight"
+            
+            other_action.upload_store(
+              release_notes: release_notes,
+              isTestFlight: is_test_flight
+            )
             notiText = "🚀🚀🚀🚀🚀🚀\n\n#{scheme}-iOS-上传完成\n\n#{version}_#{build}_#{export_method}\n\n🚀🚀🚀🚀🚀🚀"
             DingdingHelper.sendMarkdown(notiText)
           end
@@ -140,7 +155,9 @@ module Fastlane
 
           # 上传 fir
           if CommonHelper.is_validate_string(Environment.fir_api_token)
-            fir_upload_info = other_action.upload_fir()
+            fir_upload_info = other_action.upload_fir(
+              changelog: params[:changelog]
+            )
             download_url = fir_upload_info[:download_url]
 
             if CommonHelper.is_validate_string(download_url)
@@ -152,7 +169,7 @@ module Fastlane
         end
 
         # 代码分析
-        if is_analyze_swiftlint && export_method != "app-store"
+        if is_analyze_swiftlint && gym_method != "app-store"
           analyze_swiftlint(is_from_package: true, configuration: configuration)
           # 结果复制到桌面
           FileUtils.cp(SWIFTLINT_HTML_FILE, target_path)
@@ -163,7 +180,7 @@ module Fastlane
         end
 
         # 重复代码检查
-        if is_detect_duplicity_code && export_method != "app-store"
+        if is_detect_duplicity_code && gym_method != "app-store"
           detect_code_duplicity(is_all: true)
           # 结果复制到桌面
           FileUtils.cp(DUPLICITY_CODE_HTML_FILE, target_path)
@@ -173,7 +190,7 @@ module Fastlane
         end
 
         # 无用代码检查
-        if is_detect_unused_code && export_method != "app-store"
+        if is_detect_unused_code && gym_method != "app-store"
           DetectUnusedCodeAction.run(
             is_from_package: true,
             configuration: configuration
@@ -186,7 +203,7 @@ module Fastlane
         end
 
         # 无用图片检查
-        if is_detect_unused_image && export_method != "app-store"
+        if is_detect_unused_image && gym_method != "app-store"
           DetectUnusedImageAction.run({})
           # 结果复制到桌面
           FileUtils.cp(Constants.UNUSED_IMAGE_HTML_FILE, target_path)
@@ -215,6 +232,13 @@ module Fastlane
 
       def self.available_options
         [
+          FastlaneCore::ConfigItem.new(
+            key: :scheme,
+            description: "不采取默认配置，自定义 `scheme` 名称",
+            optional: true,
+            default_value: nil,
+            type: String
+          ),
           FastlaneCore::ConfigItem.new(
             key: :configuration,
             description: "编译环境 Release or Debug",
@@ -230,12 +254,12 @@ module Fastlane
           ),
           FastlaneCore::ConfigItem.new(
             key: :export_method,
-            description: "打包方式 ad-hoc, enterprise, app-store, development",
+            description: "打包方式 ad-hoc, enterprise, app-store, development, testFlight",
             optional: true,
             default_value: "development",
             type: String,
             verify_block: proc do |value|
-              valid_params = ["ad-hoc", "enterprise", "app-store", "development"]
+              valid_params = ["ad-hoc", "enterprise", "app-store", "development", "testFlight"]
               unless valid_params.include?(value)
                 UI.user_error!("无效的打包方式: #{value}。支持的方式: #{valid_params.join(', ')}")
               end
@@ -283,6 +307,12 @@ module Fastlane
             default_value: false,
             type: Boolean
           ),
+          FastlaneCore::ConfigItem.new(
+            key: :changelog,
+            description: "更新日志",
+            optional: true,
+            type: String
+          ),
           FastlaneCore::ConfigItem.new(
             key: :release_notes,
             description: "更新文案, 格式为 { \"zh-Hans\": \"修复问题\", \"en-US\": \"bugfix\"} JSON 字符串",

data/lib/fastlane/plugin/fastci/actions/upload_fir_action.rb

@@ -12,6 +12,8 @@ module Fastlane
         firinfo = other_action.fir_cli(
           api_token: Environment.fir_api_token,
           password: Environment.fir_password,
+          changelog: params[:changelog],
+          switch_to_qiniu: true
         )
         
         return firinfo
@@ -22,7 +24,14 @@ module Fastlane
       end
 
       def self.available_options
-        []
+        [
+          FastlaneCore::ConfigItem.new(
+            key: :changelog,
+            description: "更新日志",
+            optional: true,
+            type: String
+          ),
+        ]
       end
 
       def self.is_supported?(platform)

data/lib/fastlane/plugin/fastci/actions/upload_store_action.rb

@@ -6,7 +6,6 @@ module Fastlane
     # 上传 AppStore
     class UploadStoreAction < Action
       def self.run(params)
-        UI.message("*************| 开始上传 AppStore |*************")
 
         release_notes = JSON.parse(params[:release_notes] || "") rescue ""
 
@@ -17,15 +16,25 @@ module Fastlane
           duration: 1200, # optional (maximum 1200)
           in_house: false # optional but may be required if using match/sigh
         )
-        other_action.upload_to_app_store(
-          skip_metadata: false,
-          skip_screenshots: true,
-          force: true,
-          submit_for_review: false,
-          automatic_release: false,
-          release_notes: release_notes
-        )
-        
+
+        if params[:isTestFlight]
+          UI.message("*************| 开始上传 TestFlight |*************")
+          other_action.upload_to_testflight(
+            skip_waiting_for_build_processing: true
+          )
+        else
+          UI.message("*************| 开始上传 AppStore |*************")
+          other_action.upload_to_app_store(
+            skip_metadata: false,
+            skip_screenshots: true,
+            run_precheck_before_submit: false,
+            precheck_include_in_app_purchases: false,
+            force: true,
+            submit_for_review: false,
+            automatic_release: false,
+            release_notes: release_notes
+          )
+        end
       end
 
       def self.description
@@ -39,6 +48,12 @@ module Fastlane
             description: "更新文案, 格式为 { \"zh-Hans\": \"修复问题\", \"en-US\": \"bugfix\"} JSON 字符串",
             optional: false,
             type: String
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :isTestFlight,
+            description: "是否为 TestFlight 打包",
+            optional: false,
+            type: Boolean
           )
         ]
       end

data/lib/fastlane/plugin/fastci/helper/environment.rb

@@ -33,6 +33,10 @@ module Fastlane
       def self.package_file_folder_name
         ENV['PACKAGE_FILE_FOLDER_NAME']
       end
+      # 是否自动更新描述文件
+      def self.is_auto_update_provisioning
+        ENV['IS_AUTO_UPDATE_PROVISIONING'] == "true"
+      end
 
       # 描述文件配置
       def self.provisioningProfiles_development

data/lib/fastlane/plugin/fastci/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module Fastci
-    VERSION = "0.0.7"
+    VERSION = "0.0.9"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-fastci
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors:
 - watermelon