From 552744aead9527bef52896a2aef9964ed995a0ed Mon Sep 17 00:00:00 2001
From: monlor <monlor@qq.com>
Date: Thu, 5 Mar 2020 22:13:57 +0800
Subject: [PATCH] 2020-03-05 22:13:57

---
 .github/workflows/deploy.yaml | 15 ---------------
 .github/workflows/dev.yaml    | 29 +++++++++++++++++++++++++++++
 .github/workflows/main.yml    |  4 +++-
 .github/workflows/master.yaml |  1 +
 4 files changed, 33 insertions(+), 16 deletions(-)
 create mode 100644 .github/workflows/dev.yaml

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index bd6a7f7..7a034d8 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -42,18 +42,3 @@ jobs:
         bash ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${GH_REF}
         bash ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${CO_REF}
 
-  dev-job:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@master
-
-    - name: Pack And Deploy
-      env:
-        BRANCH_NAME: dev
-      run: |
-        git fetch origin ${BRANCH_NAME}
-        git checkout ${BRANCH_NAME}
-        bash ./tools/gitsync.sh pack 
-        bash ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${GH_REF}
-        bash ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${CO_REF}
diff --git a/.github/workflows/dev.yaml b/.github/workflows/dev.yaml
new file mode 100644
index 0000000..92f3b17
--- /dev/null
+++ b/.github/workflows/dev.yaml
@@ -0,0 +1,29 @@
+name: Dev-CI
+
+# on: [push, pull_request]
+on: 
+  push:
+    branchs:  
+      - dev
+    ignore-paths:
+      - '.github'
+      - 'README.md'
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    env:
+        GL_TOKEN: ${{ secrets.GL_TOKEN }}
+        GL_URL: ${{ secrets.GL_URL }}
+        BRANCH_NAME: ${{ github.ref }}
+    steps:
+    - name: Checkout
+      uses: actions/checkout@master
+
+    - name: Pack And Deploy
+      run: |
+        bash ./tools/gitsync.sh pack 
+        bash ./tools/gitsync.sh deploy mbfiles `basename ${BRANCH_NAME}` http://${GL_TOKEN}@${GL_URL}/monlor/mbfiles.git
+
+    - name: Sync Code
+      run: git push http://${GL_TOKEN}@${GL_URL}/monlor/mixbox.git `basename ${BRANCH_NAME}`:`basename ${BRANCH_NAME}`
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1a03e66..5e3d8a8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -6,7 +6,6 @@ on:
     branchs:  
       - master
       - test
-      - dev
     ignore-paths:
       - '.github'
       - 'README.md'
@@ -25,6 +24,9 @@ jobs:
     - name: Checkout
       uses: actions/checkout@master
 
+    - name: Sync Code
+      run: git push http://${GL_TOKEN}@${GL_URL}/monlor/mixbox.git `basename ${BRANCH_NAME}`:`basename ${BRANCH_NAME}`
+
     - name: Pack And Deploy
       run: |
         bash ./tools/gitsync.sh pack 
diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml
index 2717f51..bf85dca 100644
--- a/.github/workflows/master.yaml
+++ b/.github/workflows/master.yaml
@@ -20,6 +20,7 @@ jobs:
       env:
         BRANCH_NAME: master
       run: |
+        git fetch origin ${BRANCH_NAME}
         git checkout ${BRANCH_NAME}
         bash ./tools/gitsync.sh pack 
         bash ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${GH_REF}