From 9047504b1890e3efd80ec97fc12c769a55016126 Mon Sep 17 00:00:00 2001
From: monlor <monlor@qq.com>
Date: Fri, 6 Mar 2020 14:41:07 +0800
Subject: [PATCH] 2020-03-06 14:41:07

---
 .github/workflows/{bak => }/main.yml          |  5 +-
 .../.gitlab-ci-template.yaml                  |  0
 backup/.gitlab-ci.yml                         | 79 +++++++++++++++++++
 3 files changed, 80 insertions(+), 4 deletions(-)
 rename .github/workflows/{bak => }/main.yml (91%)
 rename .gitlab-ci-template.yaml => backup/.gitlab-ci-template.yaml (100%)
 create mode 100644 backup/.gitlab-ci.yml

diff --git a/.github/workflows/bak/main.yml b/.github/workflows/main.yml
similarity index 91%
rename from .github/workflows/bak/main.yml
rename to .github/workflows/main.yml
index 48f86b7..b7e6aa2 100644
--- a/.github/workflows/bak/main.yml
+++ b/.github/workflows/main.yml
@@ -6,10 +6,6 @@ on:
     branchs:  
       - master
       - test
-    tags-ignore:
-      - deploy-*
-      - test-*
-      - master-*
     ignore-paths:
       - '.github'
       - 'README.md'
@@ -30,6 +26,7 @@ jobs:
 
     - name: Pack And Deploy
       run: |
+        git clone -b `basename ${BRANCH_NAME}` ${GH_REF}
         bash ./tools/gitsync.sh pack 
         bash ./tools/gitsync.sh deploy mbfiles `basename ${BRANCH_NAME}` ${GH_REF}
         bash ./tools/gitsync.sh deploy mbfiles `basename ${BRANCH_NAME}` ${CO_REF}
\ No newline at end of file
diff --git a/.gitlab-ci-template.yaml b/backup/.gitlab-ci-template.yaml
similarity index 100%
rename from .gitlab-ci-template.yaml
rename to backup/.gitlab-ci-template.yaml
diff --git a/backup/.gitlab-ci.yml b/backup/.gitlab-ci.yml
new file mode 100644
index 0000000..b58b214
--- /dev/null
+++ b/backup/.gitlab-ci.yml
@@ -0,0 +1,79 @@
+image: lholota/bash-git:latest
+
+stages:
+  - deploy
+
+deploy:branchs:
+  stage: deploy
+  only:        
+    - master
+    - test
+  script:
+    - apk add git-lfs
+    - git clone -b ${CI_COMMIT_REF_NAME} ${GL_REF}/monlor/mbfiles.git 
+    - bash -e ./tools/gitsync.sh pack
+    # - 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
+
+# deploy:dev:
+#   stage: deploy
+#   only:        
+#     - dev
+#   script:
+#     - apk add git-lfs
+#     - git clone -b ${CI_COMMIT_REF_NAME} ${GL_REF}/monlor/mbfiles.git 
+#     - bash -e ./tools/gitsync.sh pack
+#     - bash ./tools/gitsync.sh deploy mbfiles ${CI_COMMIT_REF_NAME} ${GL_REF}/monlor/mbfiles.git
+
+deploy:master:
+  stage: deploy
+  only:
+    - tags
+  tags:
+    - deploy-*
+  script:
+    - apk add git-lfs
+    - git fetch origin master
+    - git checkout master
+    - git clone -b master ${GL_REF}/monlor/mbfiles.git 
+    - bash -e ./tools/gitsync.sh pack
+    - bash ./tools/gitsync.sh deploy mbfiles master ${CO_REF}/monlor/mbfiles.git
+  cache:
+    key: master
+    untracked: true
+
+deploy:test:
+  stage: deploy
+  only:
+    - tags
+  tags:
+    - deploy-*
+  script:
+    - apk add git-lfs
+    - git fetch origin test
+    - git checkout test
+    - git clone -b test ${GL_REF}/monlor/mbfiles.git 
+    - bash -e ./tools/gitsync.sh pack
+    - bash ./tools/gitsync.sh deploy mbfiles test ${CO_REF}/monlor/mbfiles.git
+  cache:
+    key: test
+    untracked: true
+
+syncode:github:
+  stage: deploy
+  only:        
+    - master
+    - test
+    - dev
+  script:
+    - git fetch origin ${CI_COMMIT_REF_NAME}
+    - git checkout ${CI_COMMIT_REF_NAME}
+    - 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/
+