From 6a5292033be628a1783c01b883da2c08559e41f0 Mon Sep 17 00:00:00 2001
From: monlor <monlor@qq.com>
Date: Thu, 5 Mar 2020 22:16:52 +0800
Subject: [PATCH] 2020-03-05 22:16:51

---
 .github/workflows/dev.yaml | 6 +++---
 .github/workflows/main.yml | 8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/dev.yaml b/.github/workflows/dev.yaml
index 92f3b17..0058ac7 100644
--- a/.github/workflows/dev.yaml
+++ b/.github/workflows/dev.yaml
@@ -15,7 +15,7 @@ jobs:
     env:
         GL_TOKEN: ${{ secrets.GL_TOKEN }}
         GL_URL: ${{ secrets.GL_URL }}
-        BRANCH_NAME: ${{ github.ref }}
+        BRANCH_NAME: dev
     steps:
     - name: Checkout
       uses: actions/checkout@master
@@ -23,7 +23,7 @@ jobs:
     - 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
+        bash ./tools/gitsync.sh deploy mbfiles ${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}`
+      run: git push http://${GL_TOKEN}@${GL_URL}/monlor/mixbox.git ${BRANCH_NAME}:${BRANCH_NAME}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5e3d8a8..4558198 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,16 +19,18 @@ jobs:
     env:
         GH_REF: ${{ secrets.GH_REF }}
         CO_REF: ${{ secrets.CO_REF }}
+        GL_TOKEN: ${{ secrets.GL_TOKEN }}
+        GL_URL: ${{ secrets.GL_URL }}
         BRANCH_NAME: ${{ github.ref }}
     steps:
     - 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 
         bash ./tools/gitsync.sh deploy mbfiles `basename ${BRANCH_NAME}` ${GH_REF}
         bash ./tools/gitsync.sh deploy mbfiles `basename ${BRANCH_NAME}` ${CO_REF}
+
+    - name: Sync Code
+      run: git push http://${GL_TOKEN}@${GL_URL}/monlor/mixbox.git `basename ${BRANCH_NAME}`:`basename ${BRANCH_NAME}`