From 44765ef57c715217df874b15a3244a021d9aed4c Mon Sep 17 00:00:00 2001
From: monlor <monlor@qq.com>
Date: Fri, 6 Mar 2020 15:21:33 +0800
Subject: [PATCH] 2020-03-06 15:21:32

---
 .github/workflows/{bak => }/deploy.yaml | 20 ++++++++++++++++++--
 .github/workflows/main.yml              |  1 -
 tools/gitsync.sh                        |  4 ++--
 3 files changed, 20 insertions(+), 5 deletions(-)
 rename .github/workflows/{bak => }/deploy.yaml (68%)

diff --git a/.github/workflows/bak/deploy.yaml b/.github/workflows/deploy.yaml
similarity index 68%
rename from .github/workflows/bak/deploy.yaml
rename to .github/workflows/deploy.yaml
index 7a034d8..9af57f4 100644
--- a/.github/workflows/bak/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -22,8 +22,8 @@ jobs:
       run: |
         git fetch origin ${BRANCH_NAME}
         git checkout ${BRANCH_NAME}
+        git clone -b ${BRANCH_NAME} ${CO_REF}
         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}
 
   test-job:
@@ -38,7 +38,23 @@ jobs:
       run: |
         git fetch origin ${BRANCH_NAME}
         git checkout ${BRANCH_NAME}
+        git clone -b ${BRANCH_NAME} ${CO_REF}
+        bash ./tools/gitsync.sh pack 
+        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}
+        git clone -b ${BRANCH_NAME} ${CO_REF}
         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/main.yml b/.github/workflows/main.yml
index e5903c4..0b0ae48 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -29,5 +29,4 @@ jobs:
       run: |
         git clone -b `basename ${BRANCH_NAME}` ${CO_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/tools/gitsync.sh b/tools/gitsync.sh
index 026a984..f84bcad 100755
--- a/tools/gitsync.sh
+++ b/tools/gitsync.sh
@@ -77,8 +77,8 @@ pack() {
 	gerneral_applist
 
 	mkdir -p ${pack_dir}/appstore 2> /dev/null
-	cp -rf appsbin/ ${pack_dir}/appsbin/
-  cp -rf temp/ ${pack_dir}/temp/
+	cp -rf appsbin ${pack_dir}/
+  cp -rf temp ${pack_dir}/
   cp -rf install.sh ${pack_dir}/
   mv -f appstore/* ${pack_dir}/appstore/
   mv -f applist.txt ${pack_dir}/