fastlane-plugin-fastci 0.0.30 → 0.0.40

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

@@ -1,6 +1,7 @@
 require 'gym'
 require 'fastlane_core'
 require 'fastlane/action'
+require 'fastlane/plugin/fastci/helper/app_store_resources_helper'
 include Fastlane::Helper
 
 module Fastlane
@@ -17,7 +18,7 @@ module Fastlane
         is_detect_duplicity_code = params[:is_detect_duplicity_code] || false
         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] || ''
+        store_options = store_upload_options(params, export_method)
         configuration = 'Release' if %w[app-store testFlight].include?(export_method)
         is_notice_dingding = params[:is_notice_dingding].nil? ? true : params[:is_notice_dingding]
         # 统一发送钉钉消息匿名函数
@@ -145,14 +146,7 @@ module Fastlane
           notiText = "🚀🚀🚀🚀🚀🚀\n\n#{scheme}-iOS-打包完成\n\n#{version}_#{build}_#{export_method}\n\n🚀🚀🚀🚀🚀🚀"
           send_dingding_notice.call(notiText)
 
-          if CommonHelper.is_validate_string(Environment.connect_key_id) && CommonHelper.is_validate_string(Environment.connect_issuer_id)
-            # 根据 export_method 决定是否为 TestFlight
-            is_test_flight = export_method == 'testFlight'
-
-            other_action.upload_store(
-              release_notes: release_notes,
-              isTestFlight: is_test_flight
-            )
+          if upload_store_if_configured(store_options, version: version, build: build)
             notiText = "🚀🚀🚀🚀🚀🚀\n\n#{scheme}-iOS-上传完成\n\n#{version}_#{build}_#{export_method}\n\n🚀🚀🚀🚀🚀🚀"
             send_dingding_notice.call(notiText)
           end
@@ -267,12 +261,67 @@ module Fastlane
         UI.message('*************| 脚本完成 |*************')
       end
 
+      # 构建前准备商店上传参数，开启资源功能却漏配路径时立即报错。
+      def self.store_upload_options(params, export_method)
+        config_path = AppStoreResourcesHelper.upload_config_path(params, app_store: export_method == 'app-store')
+        options = {
+          release_notes: params[:release_notes] || '',
+          isTestFlight: export_method == 'testFlight',
+          # 显式透传 false，避免下层 Action 从环境变量重新开启本次已关闭的功能。
+          app_store_resources_enabled: !config_path.nil?
+        }
+        options[:app_store_resources_config_path] = config_path if config_path
+        options
+      end
+
+      # 根据凭据或已开启的资源配置判断是否上传，单独存在资源路径不能触发上传。
+      def self.store_upload_configured?(options)
+        has_p8_key = CommonHelper.is_validate_string(Environment.connect_key_id) &&
+          CommonHelper.is_validate_string(Environment.connect_issuer_id)
+        has_api_key_json = CommonHelper.is_validate_string(Environment.app_store_connect_api_key_path)
+        has_p8_key || has_api_key_json || options[:app_store_resources_enabled]
+      end
+
+      # 上传本次产物，并返回是否执行了上传，供主流程决定是否发送完成通知。
+      def self.upload_store_if_configured(options, version:, build:)
+        return false unless store_upload_configured?(options)
+
+        upload_options = options.dup
+        if upload_options[:app_store_resources_enabled]
+          # 使用真实产物信息覆盖资源配置，避免选中 JSON 中残留的旧版本或 Build。
+          upload_options.merge!(
+            app_identifier: Environment.bundleID,
+            app_version: version.to_s,
+            build_number: build.to_s
+          )
+        end
+        other_action.upload_store(upload_options)
+        true
+      end
+
+      private_class_method :store_upload_options, :store_upload_configured?, :upload_store_if_configured
+
       def self.description
         '打包'
       end
 
       def self.available_options
         [
+          FastlaneCore::ConfigItem.new(
+            key: :app_store_resources_enabled,
+            env_name: 'APP_STORE_RESOURCES_ENABLED',
+            description: '商店资源总开关，默认关闭，仅 app-store 打包时生效',
+            optional: true,
+            default_value: false,
+            type: Boolean
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :app_store_resources_config_path,
+            env_name: 'APP_STORE_RESOURCES_CONFIG_PATH',
+            description: 'App Store 资源发布 JSON 路径，开启商店资源总开关后必填',
+            optional: true,
+            type: String
+          ),
           FastlaneCore::ConfigItem.new(
             key: :is_upload_zealot_dsym,
             env_name: 'ZEALOT_UPLOAD_DSYM',

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

@@ -1,4 +1,6 @@
 require 'fastlane/action'
+require 'json'
+require 'fastlane/plugin/fastci/helper/app_store_resources_helper'
 include Fastlane::Helper
 
 module Fastlane
@@ -6,62 +8,141 @@ module Fastlane
     # 上传 AppStore
     class UploadStoreAction < Action
       def self.run(params)
+        resource_params, api_key_options = prepare_upload(params)
 
-        release_notes = JSON.parse(params[:release_notes] || "") rescue nil
+        if params[:isTestFlight]
+          upload_testflight(api_key_options)
+        else
+          upload_app_store(resource_params, api_key_options)
+        end
+      end
 
-        other_action.app_store_connect_api_key(
-          key_id: Environment.connect_key_id,
-          issuer_id: Environment.connect_issuer_id,
-          key_filepath: File.expand_path("#{Environment.package_file_folder_name}/AuthKey_#{Environment.connect_key_id}.p8"),
-          duration: 1200, # optional (maximum 1200)
-          in_house: false # optional but may be required if using match/sigh
+      # 上传前统一准备认证和资源，确保配置错误或资源缺失在 IPA 上传前被发现。
+      def self.prepare_upload(params)
+        resource_params = load_store_resources(params)
+        api_key_options = AppStoreResourcesHelper.authentication_options(resource_params || {}, other_action)
+        if resource_params
+          resource_params.merge!(api_key_options)
+          resource_params = AppStoreResourcesHelper.prepare(resource_params)
+        end
+        [resource_params, api_key_options]
+      end
+
+      # 只有显式开启的 App Store 流程读取资源配置，关闭时不解析路径或更新说明。
+      def self.load_store_resources(params)
+        config_path = AppStoreResourcesHelper.upload_config_path(params, app_store: !params[:isTestFlight])
+        return nil unless config_path
+
+        AppStoreResourcesHelper.load_params(
+          app_store_resources_enabled: true,
+          config_path: config_path,
+          app_identifier: params[:app_identifier],
+          app_version: params[:app_version],
+          build_number: params[:build_number],
+          release_notes: parse_release_notes(params[:release_notes])
         )
+      end
 
-        if params[:isTestFlight]
-          UI.message("*************| 开始上传 TestFlight |*************")
-          other_action.upload_to_testflight(
-            skip_waiting_for_build_processing: true
-          )
-        else
-          UI.message("*************| 开始上传 AppStore |*************")
-          
-          # 构建上传参数，只有当 release_notes 有效时才添加
-          upload_options = {
-            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 不为 nil 且不为空时才添加
-          if release_notes && !release_notes.empty?
-            upload_options[:release_notes] = release_notes
-          end
-          
-          other_action.upload_to_app_store(upload_options)
+      # 保留原 JSON 字符串接口；空值或无效 JSON 不覆盖资源文件中的更新说明。
+      def self.parse_release_notes(value)
+        JSON.parse(value || '')
+      rescue JSON::ParserError, TypeError
+        nil
+      end
+
+      # TestFlight 沿用现有上传方式，不执行 App Store 资源流程。
+      def self.upload_testflight(api_key_options)
+        UI.message('*************| 开始上传 TestFlight |*************')
+        other_action.upload_to_testflight({ skip_waiting_for_build_processing: true }.merge(api_key_options))
+      end
+
+      # 先上传 IPA，再处理已校验的资源；返回 IPA 上传结果以兼容已有 lane。
+      def self.upload_app_store(resource_params, api_key_options)
+        UI.message('*************| 开始上传 AppStore |*************')
+        upload_options = app_store_upload_options(resource_params).merge(api_key_options)
+        upload_result = other_action.upload_to_app_store(upload_options)
+        if resource_params
+          # 新版本判断已在 IPA 上传前完成，之后直接使用确认过的资源上传开关。
+          other_action.app_store_resources(resource_params.merge(upload_metadata_on_new_version: false))
         end
+        upload_result
       end
 
+      # IPA 阶段始终关闭资源上传，避免默认目录或 Deliverfile 绕过资源总开关。
+      def self.app_store_upload_options(resource_params)
+        options = {
+          skip_metadata: true,
+          skip_screenshots: true,
+          # deliver 的截图同步分支不受 skip_screenshots 控制，必须一并关闭。
+          sync_screenshots: false,
+          overwrite_screenshots: false,
+          run_precheck_before_submit: false,
+          precheck_include_in_app_purchases: false,
+          force: true,
+          submit_for_review: false,
+          automatic_release: false
+        }
+        if resource_params
+          options[:app_identifier] = resource_params[:app_identifier]
+          options[:app_version] = resource_params[:app_version] if resource_params[:app_version]
+        end
+        options
+      end
+
+      private_class_method :prepare_upload, :load_store_resources, :parse_release_notes,
+                           :upload_testflight, :upload_app_store, :app_store_upload_options
+
       def self.description
         "上传 AppStore"
       end
 
       def self.available_options
         [
+          FastlaneCore::ConfigItem.new(
+            key: :app_store_resources_enabled,
+            env_name: 'APP_STORE_RESOURCES_ENABLED',
+            description: '商店资源总开关，默认关闭；关闭时仅上传 IPA，不更新元数据或截图',
+            optional: true,
+            default_value: false,
+            type: Boolean
+          ),
           FastlaneCore::ConfigItem.new(
             key: :release_notes,
             description: "更新文案, 格式为 { \"zh-Hans\": \"修复问题\", \"en-US\": \"bugfix\"} JSON 字符串",
-            optional: false,
+            optional: true,
             type: String
           ),
           FastlaneCore::ConfigItem.new(
             key: :isTestFlight,
             description: "是否为 TestFlight 打包",
-            optional: false,
+            optional: true,
+            default_value: false,
             type: Boolean
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :app_store_resources_config_path,
+            env_name: 'APP_STORE_RESOURCES_CONFIG_PATH',
+            description: 'App Store 资源发布 JSON 路径，开启商店资源总开关后必填',
+            optional: true,
+            type: String
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :app_identifier,
+            description: '本次构建的 Bundle ID，覆盖资源配置',
+            optional: true,
+            type: String
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :app_version,
+            description: '本次构建的版本号，覆盖资源配置',
+            optional: true,
+            type: String
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :build_number,
+            description: '本次构建的 Build 号，覆盖资源配置',
+            optional: true,
+            type: String
           )
         ]
       end
@@ -72,4 +153,4 @@ module Fastlane
 
     end
   end
-end
+end