From 54d115a1bfb99f44b132116e9b8ccee3c6058cc5 Mon Sep 17 00:00:00 2001
From: monlor <monlor@qq.com>
Date: Fri, 6 Mar 2020 12:01:13 +0800
Subject: [PATCH] 2020-03-06 12:01:13

---
 .gitlab-ci.yml   | 8 ++++----
 tools/gitsync.sh | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 056999c..cd1bb53 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,8 +20,8 @@ deploy:
     - test
     - dev
   script:
-    - bash -e ./tools/gitsync.sh deploy mbfiles ${CI_COMMIT_REF_NAME} ${GL_REF}/monlor/mbfiles.git
-    - bash -e ./tools/gitsync.sh deploy mbfiles ${CI_COMMIT_REF_NAME} ${CO_REF}/monlor/mbfiles.git
+    - bash ./tools/gitsync.sh deploy mbfiles ${CI_COMMIT_REF_NAME} ${GL_REF}/monlor/mbfiles.git
+    - bash ./tools/gitsync.sh deploy mbfiles ${CI_COMMIT_REF_NAME} ${CO_REF}/monlor/mbfiles.git
 
 pack-master:
   stage: pack
@@ -52,8 +52,8 @@ deploy-master:
   tags:
     - deploy-*
   script:
-    - bash -e ./tools/gitsync.sh deploy mbfiles-master ${CI_COMMIT_REF_NAME} ${CO_REF}/monlor/mbfiles.git
-    - bash -e ./tools/gitsync.sh deploy mbfiles-test ${CI_COMMIT_REF_NAME} ${CO_REF}/monlor/mbfiles.git
+    - bash ./tools/gitsync.sh deploy mbfiles-master ${CI_COMMIT_REF_NAME} ${CO_REF}/monlor/mbfiles.git
+    - bash ./tools/gitsync.sh deploy mbfiles-test ${CI_COMMIT_REF_NAME} ${CO_REF}/monlor/mbfiles.git
 
 cache:
   key: ${CI_COMMIT_REF_NAME}
diff --git a/tools/gitsync.sh b/tools/gitsync.sh
index 678328b..0e765be 100755
--- a/tools/gitsync.sh
+++ b/tools/gitsync.sh
@@ -124,8 +124,8 @@ deploy() {
 	if git status &> /dev/null; then
 	  git add .
 	  git commit -m "$(TZ='Asia/Shanghai' date "+%Y-%m-%d %H:%M:%S")" -a
-	  git push "$3" master:"$2" -f 
 	fi
+	git push "$3" master:"$2" -f 
   
 }