From a3f6b6458c5215deb1a79ca16f3d968f629e7f21 Mon Sep 17 00:00:00 2001
From: monlor <monlor@qq.com>
Date: Thu, 5 Mar 2020 19:00:43 +0800
Subject: [PATCH] 2020-03-05 19:00:42

---
 .github/workflows/main.yml |  9 +++------
 .github/workflows/tag.yaml | 39 +++++++++++++++++++++++++-------------
 tools/gitsync.sh           |  5 ++---
 3 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 902c163..fd3d324 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,11 +12,8 @@ jobs:
     - name: Checkout
       uses: actions/checkout@master
 
-    - name: Deploy
-      env:
-        GH_REF: ${{ secrets.GH_REF }}
-        CO_REF: ${{ secrets.CO_REF }}
+    - name: Pack And Deploy
       run: |
         bash ./tools/gitsync.sh pack 
-        bash ./tools/gitsync.sh deploy mbfiles `git branch | awk  '$1 == "*"{print $2}'` ${GH_REF}
-        bash ./tools/gitsync.sh deploy mbfiles `git branch | awk  '$1 == "*"{print $2}'` ${CO_REF}
\ No newline at end of file
+        bash -x ./tools/gitsync.sh deploy mbfiles `git branch | awk  '$1 == "*"{print $2}'` ${GH_REF}
+        bash -x ./tools/gitsync.sh deploy mbfiles `git branch | awk  '$1 == "*"{print $2}'` ${CO_REF}
diff --git a/.github/workflows/tag.yaml b/.github/workflows/tag.yaml
index cc5f708..c66acec 100644
--- a/.github/workflows/tag.yaml
+++ b/.github/workflows/tag.yaml
@@ -5,39 +5,52 @@ on:
     tags:  
       - deploy-*
 
+env:
+  GH_REF: ${{ secrets.GH_REF }}
+  CO_REF: ${{ secrets.CO_REF }}
+
 jobs:
-  publish:
+  master:
     runs-on: ubuntu-latest
-    env:
-      GH_REF: ${{ secrets.GH_REF }}
-      CO_REF: ${{ secrets.CO_REF }}
     steps:
     - name: Checkout
       uses: actions/checkout@master
 
-    - name: Deploy Master
+    - name: Pack And Deploy
       env:
         BRANCH_NAME: master
       run: |
         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}
+        bash -x ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${GH_REF}
+        bash -x ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${CO_REF}
 
-    - name: Deploy Test
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@master
+
+    - name: Pack And Deploy
       env:
         BRANCH_NAME: test
       run: |
         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}
+        bash -x ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${GH_REF}
+        bash -x ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${CO_REF}
 
-    - name: Deploy Dev
+  dev:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@master
+
+    - name: Pack And Deploy
       env:
         BRANCH_NAME: dev
       run: |
         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}
+        bash -x ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${GH_REF}
+        bash -x ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${CO_REF}
diff --git a/tools/gitsync.sh b/tools/gitsync.sh
index 5f124ad..b69a5cb 100755
--- a/tools/gitsync.sh
+++ b/tools/gitsync.sh
@@ -40,10 +40,8 @@ pack_app() {
 		ls apps/$appname/bin 2> /dev/null | grep -E "${model}|^[a-z0-9-]{1,}[^_]$" | while read line; do
 			cp -rf apps/$appname/bin/$line pack/$appname/bin/${line/_${model}/}
 		done
-		echo "正在打包插件[$appname]平台[$model]，文件名[${appname}_${model}.tar.gz]..."
+		# echo "正在打包插件[$appname]平台[$model]，文件名[${appname}_${model}.tar.gz]..."
 		tar zcvf ${appname}_${model}.tar.gz -C pack/ ${appname}/ &> /dev/null
-		# [ ! -d ./appstore/history ] && mkdir ./appstore/history
-		# mv ./appstore/${appname}_${model}.tar.gz ./appstore/history &> /dev/null
 		mv -f ${appname}_${model}.tar.gz ./appstore
 		rm -rf pack/$appname/
 	done
@@ -64,6 +62,7 @@ pack() {
 	rm -rf appstore/
 	rm -rf mbfiles/
 
+	echo "开始打包插件..."
  	mkdir appstore
 	ls apps/ | while read line; do
 		pack_app $line