gct 0.4.9 → 0.5.0
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/gct/command/autotag.rb +1 -1
- data/lib/gct/command/update/tag.rb +6 -1
- data/lib/gct/gct_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: aa8c2d1eee0e3de12793d740b4b85285d7ef4aa94748b6c8f8dad352a17b2d06
|
|
4
|
+
data.tar.gz: e0f6650f0f55f6e065b625f692f6409df5ed1d7fdd65f9fa056b36f191bbf344
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 82c58652b0e9ac64ebd3872637827a80e15dcc7b037d746e896dc6b955e3b3e26521c2035aaf0b6ea9f5bbc61fe242221ad637f3bb55961965f4a0a6b6de1b8c
|
|
7
|
+
data.tar.gz: d90e059df0b133c6e42a6db11b8a960b9241b8821700ce1b69a331edad10b4bffbb898eadd15851163b8ad1b706e1f2112a442992f7ef0491a3b1b83ec20fd56
|
data/lib/gct/command/autotag.rb
CHANGED
|
@@ -249,7 +249,7 @@ module Gct
|
|
|
249
249
|
db = Database::Data.new
|
|
250
250
|
# 查询优先级最高的为完成打tag的数据
|
|
251
251
|
where_statement = "and is_pre = " + (@pre ? "1" : "0")
|
|
252
|
-
sql = "select * from tag where priority = (select MAX(priority) from tag
|
|
252
|
+
sql = "select * from tag where priority = (select MAX(priority) from tag) and project_version = '#{@version}' and tag_status != '#{SpecPublishStatus::SUCCESS}' #{where_statement}"
|
|
253
253
|
result = db.query(sql)
|
|
254
254
|
vals = ""
|
|
255
255
|
ins = ""
|
|
@@ -51,6 +51,12 @@ module Gct
|
|
|
51
51
|
end
|
|
52
52
|
|
|
53
53
|
def skip_tag_method
|
|
54
|
+
if !@update_ci
|
|
55
|
+
isEmptyMR = mr_to_master
|
|
56
|
+
if !isEmptyMR
|
|
57
|
+
accept_merge_request
|
|
58
|
+
end
|
|
59
|
+
|
|
54
60
|
isEmptyMR = mr_to_master
|
|
55
61
|
if !isEmptyMR
|
|
56
62
|
accept_merge_request
|
|
@@ -113,7 +119,6 @@ module Gct
|
|
|
113
119
|
create_file('.gitlab-ci.yml', ci_content, 'init ci')
|
|
114
120
|
mr_to_master_if_need
|
|
115
121
|
end
|
|
116
|
-
|
|
117
122
|
end
|
|
118
123
|
|
|
119
124
|
def mr_to_master_if_need
|
data/lib/gct/gct_version.rb
CHANGED