fastlane-plugin-fastci 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ec73525d2fc7e5ec78f87ea1636db7114910582cb44eda3408bc3bde430751b
-  data.tar.gz: 2b70526a319ba2919c7e88dbe44efd0b36a34a4f31be9e7f4112d897f422c635
+  metadata.gz: de47d079b6f45ac92b63acc4290149d8c43908a0b203e9647cfbc3a72d1e4d5a
+  data.tar.gz: 82e275589197111036d99bdf6a6e849e50ed7858e91b82bece9324f48e6b213e
 SHA512:
-  metadata.gz: db85d8ef2ace70c0354e1bf7807e656e02cef23d8a99f8cf5dd2b9340decd746880370651057a75e3484abd3116fe5fc393ef93ad0a220dccca72242a8ce13c4
-  data.tar.gz: 4c265130006c89b34266d34adaf983ef0c0d4b00bb49d17de1430958a818465bb0e8c1aa7ad1fb64ddbf73526ed54b2bb5c249a3f4fd307e1d73640ed2ff5e38
+  metadata.gz: 0753ce02d14ccf66ec92fd094a221fcff8bd6bcdb02c71d9df90e7e2b0e43ee5381fc19fbe0221076f929e946e5e37cbb917e328621703968aab89e68b7f665c
+  data.tar.gz: 70bdf869a8342ea4f71a4d4f76a9fe7f0b08f20594dff1f7528e18eec8e946a8204d8def1c2cac9775f35a974105f0b587ff11dcde49a4aa3025a857b642f205

data/README.md

@@ -7,8 +7,6 @@
 简单快速的集成，5 分钟即可上手。
 配合 Jenkins 实现高度自定义。
 
-目前还在 Beta 测试阶段！！！
-
 ---
 
 ## 安装方法
@@ -27,8 +25,9 @@
 
 ## 使用方法
 
-参考 [` Fastfile `](fastlane/Fastfile) 和 [` .env.default `](fastlane/.env.default) 替换项目内 fastlane 文件夹下文件。
-然后终端进入项目根目录就可以使用 ` fastlane `
+参考 [` Fastfile `](fastlane/Fastfile) 和 [` .env.default `](fastlane/.env.default) 替换项目内 fastlane 文件夹下文件；
+项目根目录新建 ` PACKAGE_FILE_FOLDER_NAME ` 配置对应名字文件夹，将描述文件、p12 证书、p8 密钥等文件放入该文件夹下。
+然后终端进入项目根目录即可使用 ` fastlane `
 
 
 ### 使用后会在项目根目录生成文件夹
@@ -63,7 +62,8 @@ package(
 	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/install_certificate_action.rb

@@ -8,7 +8,7 @@ module Fastlane
       def self.run(params)
         UI.message("*************| 开始安装 p12 证书 |*************")
 
-        certificate_paths = Dir.glob(File.expand_path("#{Environment.certificate_folder_name}/*.p12"))
+        certificate_paths = Dir.glob(File.expand_path("#{Environment.package_file_folder_name}/*.p12"))
         certificate_paths.each do |path|
           other_action.import_certificate(
             certificate_path: path,

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

@@ -8,7 +8,7 @@ module Fastlane
       def self.run(params)
         UI.message("*************| 开始安装 provisioningProfile |*************")
         
-        provisioning_profile_paths = Dir.glob(File.expand_path("#{Environment.provisioningProfile_folder_name}/*.mobileprovision"))
+        provisioning_profile_paths = Dir.glob(File.expand_path("#{Environment.package_file_folder_name}/*.mobileprovision"))
         provisioning_profile_paths.each do |path|
           other_action.install_provisioning_profile(
             path: path

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

@@ -79,7 +79,8 @@ module Fastlane
 
         UI.message("*************| 开始打包 |*************")
 
-        other_action.gym(
+        # 根据是否自动更新描述文件来设置不同的打包参数
+        gym_options = {
           clean: true,
           silent: true,
           workspace: Environment.workspace,
@@ -89,10 +90,17 @@ module Fastlane
           output_name: ipaName,
           output_directory: Constants.IPA_OUTPUT_DIR,
           export_options: {
-            method: export_method,
-            provisioningProfiles: provisioningProfiles_map
+            method: export_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("*************| 打包完成 |*************")
 
@@ -140,7 +148,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)
@@ -283,6 +293,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,7 @@ module Fastlane
         firinfo = other_action.fir_cli(
           api_token: Environment.fir_api_token,
           password: Environment.fir_password,
+          changelog: params[:changelog],
         )
         
         return firinfo
@@ -22,7 +23,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

@@ -13,13 +13,15 @@ module Fastlane
         other_action.app_store_connect_api_key(
           key_id: Environment.connect_key_id,
           issuer_id: Environment.connect_issuer_id,
-          key_filepath: File.expand_path("./AuthKey_#{Environment.connect_key_id}.p8"),
+          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
         )
         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,

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

@@ -29,10 +29,16 @@ module Fastlane
         ENV['SCHEMES_NAME']&.split(",") || []
       end
 
-      # 描述文件配置
-      def self.provisioningProfile_folder_name
-        ENV['PROFILE_FOLDER_NAME']
+      # 证书描述文件等放置的文件夹名称
+      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
         ENV['PROFILE_DEVELOPMENT']
       end
@@ -53,9 +59,6 @@ module Fastlane
       end
 
       # p12 证书配置
-      def self.certificate_folder_name
-        ENV['PROFILE_FOLDER_NAME']
-      end
       def self.certificate_development
         ENV['CERTIFICATE_DEVELOPMENT']
       end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Fastci
-    VERSION = "0.0.6"
+    VERSION = "0.0.8"
   end
 end

metadata

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