pindo 5.20.2 → 5.20.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/pindo/base/git_handler.rb +5 -1
- data/lib/pindo/module/task/model/git/git_tag_task.rb +7 -1
- data/lib/pindo/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 4b1febabe3ba7ca2b2d8bd2e3f005e6aec1226b7d7881b3aebec6b6d5af1c5f0
|
|
4
|
+
data.tar.gz: bd12f36dfa900606bb82154406f6d85dbf37bcb1e16abfcd0aaa48341734d20a
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f780b333edd0ae1272d15af1c641e41c481c8ad06ded6bbd7d253f662f54de34b707ccd2e0a91097728da293ead5c053e6d1a8ea652722897a7e572e0c2ec26e
|
|
7
|
+
data.tar.gz: 88e50426cfeb85c798610f64935a1e8053d6200da20920a450c2940c79b451e78be918d55d94ea2f186d2a2feb4773b15d6e7221b294d497f4e8470a626c145d
|
|
@@ -967,7 +967,11 @@ module Pindo
|
|
|
967
967
|
uncommitted_files = get_uncommitted_files(project_dir: project_dir)
|
|
968
968
|
|
|
969
969
|
# 2. 如果没有未提交的文件，返回 NONE 类型
|
|
970
|
-
|
|
970
|
+
# 未显式指定处理方式时必须返回 NONE 而不是 nil：nil 会让 GitCommitTask 兜底成
|
|
971
|
+
# SKIP_WITH_TAG，导致构建阶段注入的源码修改在打 tag 时被当作"用户选择不提交"而跳过。
|
|
972
|
+
if uncommitted_files.nil? || uncommitted_files.empty?
|
|
973
|
+
return default_process_type || Pindo::UncommittedFilesProcessType::NONE
|
|
974
|
+
end
|
|
971
975
|
|
|
972
976
|
# 3. 如果非交互模式，使用指定的处理方式
|
|
973
977
|
unless interactive
|
|
@@ -115,8 +115,14 @@ module Pindo
|
|
|
115
115
|
@build_number = param[:build_number] if param[:build_number]
|
|
116
116
|
end
|
|
117
117
|
|
|
118
|
+
# COMMIT：用户明确选择提交。
|
|
119
|
+
# NONE：构建前工作目录本来就干净，此刻的改动只可能来自构建注入，同样需要提交进 tag。
|
|
120
|
+
# 其余（SKIP_*、STASH、RESET）都是用户明确表达过"不要提交"，必须尊重。
|
|
118
121
|
def commit_build_changes?
|
|
119
|
-
|
|
122
|
+
[
|
|
123
|
+
Pindo::UncommittedFilesProcessType::COMMIT,
|
|
124
|
+
Pindo::UncommittedFilesProcessType::NONE
|
|
125
|
+
].include?(@process_type)
|
|
120
126
|
end
|
|
121
127
|
|
|
122
128
|
# 只提交 autobuild 明确注入的源码文件，避免把 Pods、DerivedData 等构建产物带入发布提交。
|
data/lib/pindo/version.rb
CHANGED