gct 0.4.9 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c891620cdbf1ca7ebfbfea728c7119c50bdf57681153578179651c3dd5b92de
-  data.tar.gz: a141431922d4a1d38fc8a7feb9702da7023524eac255dde2e3433c97dd5b1b76
+  metadata.gz: aa8c2d1eee0e3de12793d740b4b85285d7ef4aa94748b6c8f8dad352a17b2d06
+  data.tar.gz: e0f6650f0f55f6e065b625f692f6409df5ed1d7fdd65f9fa056b36f191bbf344
 SHA512:
-  metadata.gz: 924af3952e8779c161663672988ed5b590841f5e9c4dca9d1c1acccd8d578a3d18ffd39f100e8539d980d7ce5b30145bf616d2fc159ab9d48cc1673ce674a8dc
-  data.tar.gz: 8e103f59abf58ea19c52628b947827a3b74e86aaafa7cdd42c4ab310a75b189f0530253fe1ea4106a7ab8758a5bdb50de683c76813f116c3d414e71b948e5515
+  metadata.gz: 82c58652b0e9ac64ebd3872637827a80e15dcc7b037d746e896dc6b955e3b3e26521c2035aaf0b6ea9f5bbc61fe242221ad637f3bb55961965f4a0a6b6de1b8c
+  data.tar.gz: d90e059df0b133c6e42a6db11b8a960b9241b8821700ce1b69a331edad10b4bffbb898eadd15851163b8ad1b706e1f2112a442992f7ef0491a3b1b83ec20fd56

data/lib/gct/command/autotag.rb

@@ -249,7 +249,7 @@ module Gct
         db = Database::Data.new
         # 查询优先级最高的为完成打tag的数据
         where_statement = "and is_pre = " + (@pre ? "1" : "0")
-        sql = "select * from tag where priority = (select MAX(priority) from tag where project_version = '#{@version}' and tag_status != '#{SpecPublishStatus::SUCCESS}' #{where_statement})"
+        sql = "select * from tag where priority = (select MAX(priority) from tag) and project_version = '#{@version}' and tag_status != '#{SpecPublishStatus::SUCCESS}' #{where_statement}"
         result = db.query(sql)
         vals = ""
         ins = ""

data/lib/gct/command/update/tag.rb

@@ -51,6 +51,12 @@ module Gct
         end
 
         def skip_tag_method 
+          if !@update_ci
+            isEmptyMR = mr_to_master
+            if !isEmptyMR
+              accept_merge_request
+            end
+
           isEmptyMR = mr_to_master
           if !isEmptyMR
             accept_merge_request
@@ -113,7 +119,6 @@ module Gct
             create_file('.gitlab-ci.yml', ci_content, 'init ci')
             mr_to_master_if_need
           end
-          
         end
 
         def mr_to_master_if_need 

data/lib/gct/gct_version.rb

@@ -2,5 +2,5 @@ module Gct
   # freeze 冻结对象，将对象变成一个常量
   # unless 右边的代码块成立，才会运行左边的代码块
   # defined? 是用来判断本地变量是否存在，也可用来判断是否存在方法
-  VERSION = "0.4.9".freeze unless defined? Gct::VERSION
+  VERSION = "0.5.0".freeze unless defined? Gct::VERSION
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gct
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.5.0
 platform: ruby
 authors:
 - jieming