Label ci last version to 0.5.0, remove 0.4.0 compatibility test code.

laodouya · laodouya · commit 74b1460e47ee · 2019-03-28T16:16:58.000+08:00
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ variables:
   CACHE_DIR: /CovenantSQL_bins
   PIPELINE_CACHE: $CACHE_DIR/$CI_PIPELINE_IID
   BIN_CACHE: $CACHE_DIR/$CI_PIPELINE_IID/bin
-  PREV_VERSION: v0.4.0
+  PREV_VERSION: v0.5.0
   # gitlabci bins: 192.168.2.100:/srv/gitlab-runner/config/CovenantSQL_bins
 
 before_script:
diff --git a/conf/config.go b/conf/config.go
@@ -69,7 +69,7 @@ type BPInfo struct {
 	NodeID proto.NodeID `yaml:"NodeID"`
 	// RawNodeID
 	RawNodeID proto.RawNodeID `yaml:"-"`
-	// Nonce is the nonce, SEE: cmd/cql-utils for more
+	// Nonce is the nonce, SEE: cmd/cql for more
 	Nonce cpuminer.Uint256 `yaml:"Nonce"`
 	// ChainFileName is the chain db's name
 	ChainFileName string `yaml:"ChainFileName"`
diff --git a/test/compatibility/specific_old.sh b/test/compatibility/specific_old.sh
@@ -49,40 +49,21 @@ nohup ${MINERBIN} -config node_miner_2/config.yaml >${LOGS_DIR}/miner2.log 2>&1
 # wait miner start
 sleep 20
 
-# TODO(laodouya) remove v0.4.0 code after v0.5.0 release
-if [[ $CLIENTBIN =~ "v0.4.0" ]]; then
-    ${CLIENTBIN} -config node_c/config.yaml -get-balance
+${CLIENTBIN} wallet -config node_c/config.yaml -balance all -no-password
 
-    ${CLIENTBIN} -config node_c/config.yaml -wait-tx-confirm -create '{"node":2}' | tee dsn.txt
+${CLIENTBIN} create -config node_c/config.yaml -wait-tx-confirm -no-password '{"node":2}' | tee dsn.txt
 
-    #get dsn
-    dsn=$(cat dsn.txt)
-    if [ -z "$dsn" ]; then
-        exit 1
-    fi
-
-    ${CLIENTBIN} -config ${PROJECT_DIR}/test/integration/node_c/v0.4.0.yaml -dsn ${dsn} \
-        -command 'create table test_for_new_account(column1 int);'
-
-    ${CLIENTBIN} -config ${PROJECT_DIR}/test/integration/node_c/v0.4.0.yaml -dsn ${dsn} \
-        -command 'show tables;' | tee result.log
-else
-    ${CLIENTBIN} wallet -config node_c/config.yaml -balance all -no-password
-
-    ${CLIENTBIN} create -config node_c/config.yaml -wait-tx-confirm -no-password '{"node":2}' | tee dsn.txt
-
-    #get dsn
-    dsn=$(cat dsn.txt)
-    if [ -z "$dsn" ]; then
-        exit 1
-    fi
+#get dsn
+dsn=$(cat dsn.txt)
+if [ -z "$dsn" ]; then
+    exit 1
+fi
 
-    ${CLIENTBIN} console -config ${PROJECT_DIR}/test/integration/node_c/config.yaml -dsn ${dsn} \
-        -command 'create table test_for_new_account(column1 int);' -no-password
+${CLIENTBIN} console -config ${PROJECT_DIR}/test/integration/node_c/config.yaml -dsn ${dsn} \
+    -command 'create table test_for_new_account(column1 int);' -no-password
 
-    ${CLIENTBIN} console -config ${PROJECT_DIR}/test/integration/node_c/config.yaml -dsn ${dsn} \
-        -command 'show tables;' -no-password | tee result.log
-fi
+${CLIENTBIN} console -config ${PROJECT_DIR}/test/integration/node_c/config.yaml -dsn ${dsn} \
+    -command 'show tables;' -no-password | tee result.log
 
 grep "1 row" result.log
 
