fastlane-plugin-fastci 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53ec20d0f578e7220c03e65b98d1ca1907f40d4bdd973fd5bba59fa17870ef20
-  data.tar.gz: fe1eb5138294dc9e4a6130b57ed96074f1c0981a344b8272a5d758e9c9edfb74
+  metadata.gz: 447af26ce478afd41026dd66f1ffd04d787f081457db0da892491a022bca834e
+  data.tar.gz: 417c3bb7b9d6398e3905f5858e8082fb26bb7b22eeeb4ee3b0b8b6eacdaaf1dc
 SHA512:
-  metadata.gz: f20bf4ddf3b51247b7e7be24ecadda56acb86f10232641db6d2033bcb363c084d121ddec80f92206b3c9d5a3c882273583b62b2f045df05cbfd2efc3a4e230ae
-  data.tar.gz: 9a6feee1d0e97c4147bc41d65f3c57330e91d972246a08577e583706114730574bce1b34a55d21a46288954da1263f55bf09ffbf38da46c8bf20287190c010df
+  metadata.gz: 7dc8fc8efd8a487a8aec65b4b36c0877eb1f1a105404009d255764686f629db58f23e2de63e0780d963400c088318c99e9b9e87d04e13859ea7862e0e2ce2ac7
+  data.tar.gz: 73444092de1acb713030a91230943659730c5feeb48b6aa26222e0ae7fd1786443122018731067e8ffd3a2555e3e160016f29eb54778625e36fbac558c4e9981

data/README.md

@@ -27,7 +27,8 @@
 
 ## 使用方法
 
-参考 [` Fastfile `](fastlane/Fastfile) 和 [` .env.default `](fastlane/.env.default) 替换项目内 fastlane 文件夹下文件。
+参考 [` Fastfile `](fastlane/Fastfile) 和 [` .env.default `](fastlane/.env.default) 替换项目内 fastlane 文件夹下文件；
+项目根目录新建 ` PACKAGE_FILE_FOLDER_NAME ` 配置对应名字文件夹，将描述文件、证书、p8 密钥等文件放入该文件夹下。
 然后终端进入项目根目录就可以使用 ` fastlane `
 
 
@@ -64,7 +65,7 @@ package(
 	is_detect_duplicity_code: false, # 是否检测重复代码
 	is_detect_unused_code: false, # 是否检测未使用代码
 	is_detect_unused_image: false # 是否检测未使用图片
-    release_notes: options[:release_notes] # 配合 jenkins 传参上传 appstore { "zh-Hans" => "修复问题", "en-US" => "bugfix"} 格式   
+    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

@@ -18,6 +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] || ""
         if export_method == "app-store"
           configuration = "Release"
         end
@@ -119,7 +120,7 @@ module Fastlane
 
           if CommonHelper.is_validate_string(Environment.connect_key_id) && CommonHelper.is_validate_string(Environment.connect_issuer_id)
 
-            other_action.upload_store()
+            other_action.upload_store(release_notes: release_notes)
             notiText = "🚀🚀🚀🚀🚀🚀\n\n#{scheme}-iOS-上传完成\n\n#{version}_#{build}_#{export_method}\n\n🚀🚀🚀🚀🚀🚀"
             DingdingHelper.sendMarkdown(notiText)
           end
@@ -130,7 +131,7 @@ module Fastlane
           # 上传蒲公英
           if CommonHelper.is_validate_string(Environment.pgy_api_key)
             pgy_upload_info = other_action.upload_pgy()
-            qrCode = pgy_upload_info[:buildQRCodeURL]
+            qrCode = pgy_upload_info["buildQRCodeURL"]
 
             if CommonHelper.is_validate_string(qrCode)
               notiText << "\n\n⬇️⬇️⬇️ 扫码安装 ⬇️⬇️⬇️\n\n\n密码: #{Environment.pgy_password}\n![screenshot](#{qrCode})"
@@ -284,9 +285,9 @@ module Fastlane
           ),
           FastlaneCore::ConfigItem.new(
             key: :release_notes,
-            description: "更新文案, 格式为 { \"zh-Hans\" => \"修复问题\", \"en-US\" => \"bugfix\"} ",
+            description: "更新文案, 格式为 { \"zh-Hans\": \"修复问题\", \"en-US\": \"bugfix\"} JSON 字符串",
             optional: true,
-            type: Hash
+            type: String
           )
         ]
       end

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

@@ -8,10 +8,12 @@ module Fastlane
       def self.run(params)
         UI.message("*************| 开始上传 AppStore |*************")
 
+        release_notes = JSON.parse(params[:release_notes] || "") rescue ""
+
         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
         )
@@ -21,7 +23,7 @@ module Fastlane
           force: true,
           submit_for_review: false,
           automatic_release: false,
-          release_notes: params[:release_notes] || ""
+          release_notes: release_notes
         )
         
       end
@@ -34,9 +36,9 @@ module Fastlane
         [
           FastlaneCore::ConfigItem.new(
             key: :release_notes,
-            description: "更新文案, 格式为 { \"zh-Hans\" => \"修复问题\", \"en-US\" => \"bugfix\"} ",
+            description: "更新文案, 格式为 { \"zh-Hans\": \"修复问题\", \"en-US\": \"bugfix\"} JSON 字符串",
             optional: false,
-            type: Hash
+            type: String
           )
         ]
       end

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

@@ -29,10 +29,12 @@ 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.provisioningProfiles_development
         ENV['PROFILE_DEVELOPMENT']
       end
@@ -53,9 +55,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.5"
+    VERSION = "0.0.7"
   end
 end

metadata

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