From 75fe8448040f02a1b9a01d10f3ede5d257d1babb Mon Sep 17 00:00:00 2001 From: monlor Date: Fri, 6 Mar 2020 13:55:38 +0800 Subject: [PATCH] 2020-03-06 13:55:38 --- .gitlab-ci.yml | 17 ++++++++++++++++- tools/gitsync.sh | 5 +++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 628164a..b5d0dd2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,6 +13,7 @@ pack:branchs: - dev script: - bash -e ./tools/gitsync.sh pack + retry: 2 cache: key: ${CI_COMMIT_REF_NAME} untracked: true @@ -24,10 +25,22 @@ deploy:branchs: only: - master - test - - dev 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} ${CO_REF}/monlor/mbfiles.git + - bash ./tools/gitsync.sh deploy mbfiles ${CI_COMMIT_REF_NAME} ${GH_REF}/monlor/mbfiles.git + cache: + key: ${CI_COMMIT_REF_NAME} + untracked: true + paths: + - mbfiles/ + +deploy:dev: + stage: deploy + only: + - dev + script: + - bash ./tools/gitsync.sh deploy mbfiles ${CI_COMMIT_REF_NAME} ${GL_REF}/monlor/mbfiles.git cache: key: ${CI_COMMIT_REF_NAME} untracked: true @@ -44,6 +57,7 @@ pack:master: - git fetch origin master - git checkout master - bash -e ./tools/gitsync.sh pack + retry: 2 # artifacts: # paths: # - mbfiles-msater/ @@ -63,6 +77,7 @@ pack:test: - git fetch origin test - git checkout test - bash -e ./tools/gitsync.sh pack + retry: 2 # artifacts: # paths: # - mbfiles-test/ diff --git a/tools/gitsync.sh b/tools/gitsync.sh index 0e765be..116bb66 100755 --- a/tools/gitsync.sh +++ b/tools/gitsync.sh @@ -120,6 +120,11 @@ deploy() { git init git config --local user.email "monlor@qq.com" git config --local user.name "monlor" + + fi + if [ ! -f ".gitattributes" ]; then + git lfs install + git lfs track "*" fi if git status &> /dev/null; then git add .