Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop

.gitlab-ci.yml

@@ -8,7 +8,7 @@ variables:
 
 default:
   tags:
-    - game-develop
+    - gitlab
 
 build-job:
   stage: build
@@ -29,6 +29,8 @@ build-job:
           go build -v
           cd ..
       done < shell/programs.txt
+  only:
+    - develop
 
 deploy-job:
   stage: deploy
@@ -62,6 +64,8 @@ deploy-job:
     - echo '提交代码'
     - cd $GOPATH/src/$DeployPath
     - git add .
-    - git commit -m "auto commit pipelineId: $CI_PIPELINE_ID"
+    - git commit -m "auto commit pipelineId\:$CI_PIPELINE_ID"
     - git push origin develop
+  only:
+    - develop