Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
This commit is contained in:
commit
28022634a6
|
@ -8,7 +8,7 @@ variables:
|
||||||
|
|
||||||
default:
|
default:
|
||||||
tags:
|
tags:
|
||||||
- game-develop
|
- gitlab
|
||||||
|
|
||||||
build-job:
|
build-job:
|
||||||
stage: build
|
stage: build
|
||||||
|
@ -29,6 +29,8 @@ build-job:
|
||||||
go build -v
|
go build -v
|
||||||
cd ..
|
cd ..
|
||||||
done < shell/programs.txt
|
done < shell/programs.txt
|
||||||
|
only:
|
||||||
|
- develop
|
||||||
|
|
||||||
deploy-job:
|
deploy-job:
|
||||||
stage: deploy
|
stage: deploy
|
||||||
|
@ -62,6 +64,8 @@ deploy-job:
|
||||||
- echo '提交代码'
|
- echo '提交代码'
|
||||||
- cd $GOPATH/src/$DeployPath
|
- cd $GOPATH/src/$DeployPath
|
||||||
- git add .
|
- git add .
|
||||||
- git commit -m "auto commit pipelineId: $CI_PIPELINE_ID"
|
- git commit -m "auto commit pipelineId\:$CI_PIPELINE_ID"
|
||||||
- git push origin develop
|
- git push origin develop
|
||||||
|
only:
|
||||||
|
- develop
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue