2020-03-06 13:29:16

This commit is contained in:
monlor
2020-03-06 13:29:16 +08:00
parent 32e17d5472
commit 12e0abf478
6 changed files with 69 additions and 20 deletions

View File

@@ -3,6 +3,7 @@ image: lholota/bash-git:latest
stages: stages:
- pack - pack
- deploy - deploy
- syncode
pack:branchs: pack:branchs:
stage: pack stage: pack
@@ -12,6 +13,11 @@ pack:branchs:
- dev - dev
script: script:
- bash -e ./tools/gitsync.sh pack - bash -e ./tools/gitsync.sh pack
cache:
key: ${CI_COMMIT_REF_NAME}
untracked: true
paths:
- mbfiles/
deploy:branchs: deploy:branchs:
stage: deploy stage: deploy
@@ -22,6 +28,11 @@ deploy:branchs:
script: script:
- 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} ${GL_REF}/monlor/mbfiles.git
- bash ./tools/gitsync.sh deploy mbfiles ${CI_COMMIT_REF_NAME} ${CO_REF}/monlor/mbfiles.git - bash ./tools/gitsync.sh deploy mbfiles ${CI_COMMIT_REF_NAME} ${CO_REF}/monlor/mbfiles.git
cache:
key: ${CI_COMMIT_REF_NAME}
untracked: true
paths:
- mbfiles/
pack:master: pack:master:
stage: pack stage: pack
@@ -32,10 +43,15 @@ pack:master:
script: script:
- git fetch origin master - git fetch origin master
- git checkout master - git checkout master
- bash -e ./tools/gitsync.sh pack mbfiles-master - bash -e ./tools/gitsync.sh pack
artifacts: # artifacts:
# paths:
# - mbfiles-msater/
cache:
key: master
untracked: true
paths: paths:
- mbfiles-msater/ - mbfiles/
pack:test: pack:test:
stage: pack stage: pack
@@ -46,10 +62,15 @@ pack:test:
script: script:
- git fetch origin test - git fetch origin test
- git checkout test - git checkout test
- bash -e ./tools/gitsync.sh pack mbfiles-test - bash -e ./tools/gitsync.sh pack
artifacts: # artifacts:
# paths:
# - mbfiles-test/
cache:
key: test
untracked: true
paths: paths:
- mbfiles-test/ - mbfiles/
deploy:master: deploy:master:
stage: deploy stage: deploy
@@ -58,15 +79,45 @@ deploy:master:
tags: tags:
- deploy-* - deploy-*
script: script:
- bash ./tools/gitsync.sh deploy mbfiles-master ${CI_COMMIT_REF_NAME} ${CO_REF}/monlor/mbfiles.git - bash ./tools/gitsync.sh deploy mbfiles master ${CO_REF}/monlor/mbfiles.git
- bash ./tools/gitsync.sh deploy mbfiles-test ${CI_COMMIT_REF_NAME} ${CO_REF}/monlor/mbfiles.git # dependencies:
dependencies: # - pack:master
- pack:master # - pack:test
- pack:test
cache: cache:
key: ${CI_COMMIT_REF_NAME} key: master
untracked: true untracked: true
paths: paths:
- mbfiles/ - mbfiles/
deploy:test:
stage: deploy
only:
- tags
tags:
- deploy-*
script:
- bash ./tools/gitsync.sh deploy mbfiles test ${CO_REF}/monlor/mbfiles.git
# dependencies:
# - pack:master
# - pack:test
cache:
key: test
untracked: true
paths:
- mbfiles/
syncode:github:
stage: syncode
only:
- master
- test
- dev
script:
- git push ${GH_REF}/monlor/MIXBOX.git ${CI_COMMIT_REF_NAME}:${CI_COMMIT_REF_NAME}
# cache:
# key: ${CI_COMMIT_REF_NAME}
# untracked: true
# paths:
# - mbfiles/

View File

@@ -113,8 +113,6 @@ reset() {
# $3: remote url with token # $3: remote url with token
deploy() { deploy() {
ls
sed -Ei "s#mbfiles/git/raw/[a-z]+#mbfiles/git/raw/$2#" $1/install.sh sed -Ei "s#mbfiles/git/raw/[a-z]+#mbfiles/git/raw/$2#" $1/install.sh
cd $1 cd $1