pindo 5.20.3 → 5.20.4
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 +97 -73
- data/lib/pindo/command/android/autobuild.rb +28 -19
- data/lib/pindo/command/ios/autobuild.rb +43 -42
- data/lib/pindo/command/jps/apptest.rb +8 -3
- data/lib/pindo/command/jps/media.rb +2 -1
- data/lib/pindo/command/unity/autobuild.rb +18 -7
- data/lib/pindo/command/web/autobuild.rb +28 -19
- data/lib/pindo/module/pgyer/pgyerhelper.rb +98 -52
- data/lib/pindo/module/task/model/git/git_commit_task.rb +6 -0
- data/lib/pindo/module/task/model/git/git_tag_task.rb +8 -2
- data/lib/pindo/module/task/model/git_task.rb +27 -2
- data/lib/pindo/module/task/model/jps/jps_bind_package_task.rb +65 -12
- data/lib/pindo/module/task/model/jps/jps_upload_media_task.rb +14 -5
- data/lib/pindo/module/task/model/jps/jps_workflow_message_task.rb +32 -14
- data/lib/pindo/module/task/model/jps_task.rb +20 -0
- data/lib/pindo/version.rb +1 -1
- metadata +3 -3
|
@@ -37,6 +37,26 @@ module Pindo
|
|
|
37
37
|
def self.default_retry_delay
|
|
38
38
|
10 # 默认延迟 10 秒
|
|
39
39
|
end
|
|
40
|
+
|
|
41
|
+
protected
|
|
42
|
+
|
|
43
|
+
# 从依赖任务中取 Git commit 参数
|
|
44
|
+
#
|
|
45
|
+
# 优先 GitTagTask：它固化的是 tag 那一刻的 commit，构建注入文件的提交已包含在内；
|
|
46
|
+
# 没有 tag 任务（如 skip_without_tag）时再降级到 GitCommitTask。
|
|
47
|
+
#
|
|
48
|
+
# 注意判断的是 task_param 而不是 data_param 本身——data_param 外层始终带有
|
|
49
|
+
# task_id/task_key 等字段、永远不为空，只有 task_param 才反映任务是否真的产出了数据。
|
|
50
|
+
#
|
|
51
|
+
# @return [Hash, nil] 含有效 task_param 的数据参数，都取不到时返回 nil
|
|
52
|
+
def git_commit_data_param
|
|
53
|
+
[:git_tag, :git_commit].each do |task_key|
|
|
54
|
+
data = get_data_param_by_key(task_key)
|
|
55
|
+
param = data && data[:task_param]
|
|
56
|
+
return data if param && !param.empty?
|
|
57
|
+
end
|
|
58
|
+
nil
|
|
59
|
+
end
|
|
40
60
|
end
|
|
41
61
|
end
|
|
42
62
|
end
|
data/lib/pindo/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: pindo
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 5.20.
|
|
4
|
+
version: 5.20.4
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- wade
|
|
@@ -112,7 +112,7 @@ dependencies:
|
|
|
112
112
|
version: '2.7'
|
|
113
113
|
- - ">="
|
|
114
114
|
- !ruby/object:Gem::Version
|
|
115
|
-
version: 2.7.
|
|
115
|
+
version: 2.7.1
|
|
116
116
|
type: :runtime
|
|
117
117
|
prerelease: false
|
|
118
118
|
version_requirements: !ruby/object:Gem::Requirement
|
|
@@ -122,7 +122,7 @@ dependencies:
|
|
|
122
122
|
version: '2.7'
|
|
123
123
|
- - ">="
|
|
124
124
|
- !ruby/object:Gem::Version
|
|
125
|
-
version: 2.7.
|
|
125
|
+
version: 2.7.1
|
|
126
126
|
- !ruby/object:Gem::Dependency
|
|
127
127
|
name: rqrcode
|
|
128
128
|
requirement: !ruby/object:Gem::Requirement
|