pindo 5.20.1 → 5.20.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9130519bcd67f9216d72127ff62259c9ee2af59836b59ed04b7e0b3f2c5e187
-  data.tar.gz: 35c3134a7b87562fbdad8481d3cb27c0682918c88c58b4e3cdef6072a1a8a24f
+  metadata.gz: 4b1febabe3ba7ca2b2d8bd2e3f005e6aec1226b7d7881b3aebec6b6d5af1c5f0
+  data.tar.gz: bd12f36dfa900606bb82154406f6d85dbf37bcb1e16abfcd0aaa48341734d20a
 SHA512:
-  metadata.gz: c9b16bb204b8047c7690baa0c25aa0704ab1d6e119b12b4ec60c41fd556111ff4725d6b76ad703f9f3953cdd5c114397086dea5432d858330fdfdbbe4781f2bd
-  data.tar.gz: 2ab33df32230c956a7e72a857471edcec4531d74c1ced69dadb0ce1259952e76d828f6f3428622c503d0a2e743b0c9d64bc328bf68a45c46b6c63dfa6b6bfab5
+  metadata.gz: f780b333edd0ae1272d15af1c641e41c481c8ad06ded6bbd7d253f662f54de34b707ccd2e0a91097728da293ead5c053e6d1a8ea652722897a7e572e0c2ec26e
+  data.tar.gz: 88e50426cfeb85c798610f64935a1e8053d6200da20920a450c2940c79b451e78be918d55d94ea2f186d2a2feb4773b15d6e7221b294d497f4e8470a626c145d

data/lib/pindo/base/git_handler.rb

@@ -967,7 +967,11 @@ module Pindo
         uncommitted_files = get_uncommitted_files(project_dir: project_dir)
 
         # 2. 如果没有未提交的文件，返回 NONE 类型
-        return default_process_type if uncommitted_files.nil? || uncommitted_files.empty?
+        # 未显式指定处理方式时必须返回 NONE 而不是 nil：nil 会让 GitCommitTask 兜底成
+        # SKIP_WITH_TAG，导致构建阶段注入的源码修改在打 tag 时被当作"用户选择不提交"而跳过。
+        if uncommitted_files.nil? || uncommitted_files.empty?
+          return default_process_type || Pindo::UncommittedFilesProcessType::NONE
+        end
 
         # 3. 如果非交互模式，使用指定的处理方式
         unless interactive

data/lib/pindo/module/task/model/build/android_build_dev_task.rb

@@ -82,15 +82,21 @@ module Pindo
           workflow_packname: workflow_packname
         )
 
-        # 下载并替换 Icon
-        if @app_info_obj && @app_info_obj["projectIcon"] && !@app_info_obj["projectIcon"].empty?
+        # 下载并替换 Icon，优先使用 packageProjectIcon，为空则回退到 projectIcon
+        icon_url = nil
+        if @app_info_obj
+          icon_url = @app_info_obj["packageProjectIcon"] unless @app_info_obj["packageProjectIcon"].to_s.strip.empty?
+          icon_url ||= @app_info_obj["projectIcon"] unless @app_info_obj["projectIcon"].to_s.strip.empty?
+        end
+
+        if icon_url
           icon_replace_success = Pindo::AndroidConfigHelper.download_and_replace_icon_from_url(
             project_dir: @project_path,
-            icon_url: @app_info_obj["projectIcon"]
+            icon_url: icon_url
           )
 
           unless icon_replace_success
-            raise Informative, "Icon 下载或替换失败，请检查 Icon URL 是否有效: #{@app_info_obj["projectIcon"]}"
+            raise Informative, "Icon 下载或替换失败，请检查 Icon URL 是否有效: #{icon_url}"
           end
         else
           Funlog.warning("未配置 Icon URL，跳过 Icon 替换")

data/lib/pindo/module/task/model/build/ios_build_dev_task.rb

@@ -142,15 +142,21 @@ module Pindo
           project_id: project_id
         )
 
-        # 下载并替换 Icon
-        if @app_info_obj && @app_info_obj["packageProjectIcon"] && !@app_info_obj["packageProjectIcon"].empty?
+        # 下载并替换 Icon，优先使用 packageProjectIcon，为空则回退到 projectIcon
+        icon_url = nil
+        if @app_info_obj
+          icon_url = @app_info_obj["packageProjectIcon"] unless @app_info_obj["packageProjectIcon"].to_s.strip.empty?
+          icon_url ||= @app_info_obj["projectIcon"] unless @app_info_obj["projectIcon"].to_s.strip.empty?
+        end
+
+        if icon_url
           icon_replace_success = Pindo::XcodeBuildConfig.download_and_replace_icon_from_url(
             project_dir: @project_path,
-            icon_url: @app_info_obj["packageProjectIcon"]
+            icon_url: icon_url
           )
 
           unless icon_replace_success
-            raise Informative, "Icon 下载或替换失败，请检查 Icon URL 是否有效: #{@app_info_obj["packageProjectIcon"]}"
+            raise Informative, "Icon 下载或替换失败，请检查 Icon URL 是否有效: #{icon_url}"
           end
         else
           Funlog.warning("未配置 Icon URL，跳过 Icon 替换")

data/lib/pindo/module/task/model/git/git_tag_task.rb

@@ -115,8 +115,14 @@ module Pindo
         @build_number = param[:build_number] if param[:build_number]
       end
 
+      # COMMIT：用户明确选择提交。
+      # NONE：构建前工作目录本来就干净，此刻的改动只可能来自构建注入，同样需要提交进 tag。
+      # 其余（SKIP_*、STASH、RESET）都是用户明确表达过"不要提交"，必须尊重。
       def commit_build_changes?
-        @process_type == Pindo::UncommittedFilesProcessType::COMMIT
+        [
+          Pindo::UncommittedFilesProcessType::COMMIT,
+          Pindo::UncommittedFilesProcessType::NONE
+        ].include?(@process_type)
       end
 
       # 只提交 autobuild 明确注入的源码文件，避免把 Pods、DerivedData 等构建产物带入发布提交。

data/lib/pindo/version.rb

@@ -6,7 +6,7 @@ require 'time'
 
 module Pindo
 
-  VERSION = "5.20.1"
+  VERSION = "5.20.3"
 
   class VersionCheck
     RUBYGEMS_API = 'https://rubygems.org/api/v1/gems/pindo.json'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 5.20.1
+  version: 5.20.3
 platform: ruby
 authors:
 - wade