2020-03-05 19:00:42

This commit is contained in:
monlor
2020-03-05 19:00:43 +08:00
parent 937afb2f86
commit a3f6b6458c
3 changed files with 31 additions and 22 deletions

View File

@@ -12,11 +12,8 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@master uses: actions/checkout@master
- name: Deploy - name: Pack And Deploy
env:
GH_REF: ${{ secrets.GH_REF }}
CO_REF: ${{ secrets.CO_REF }}
run: | run: |
bash ./tools/gitsync.sh pack bash ./tools/gitsync.sh pack
bash ./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}'` ${GH_REF}
bash ./tools/gitsync.sh deploy mbfiles `git branch | awk '$1 == "*"{print $2}'` ${CO_REF} bash -x ./tools/gitsync.sh deploy mbfiles `git branch | awk '$1 == "*"{print $2}'` ${CO_REF}

View File

@@ -5,39 +5,52 @@ on:
tags: tags:
- deploy-* - deploy-*
jobs: env:
publish:
runs-on: ubuntu-latest
env:
GH_REF: ${{ secrets.GH_REF }} GH_REF: ${{ secrets.GH_REF }}
CO_REF: ${{ secrets.CO_REF }} CO_REF: ${{ secrets.CO_REF }}
jobs:
master:
runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@master uses: actions/checkout@master
- name: Deploy Master - name: Pack And Deploy
env: env:
BRANCH_NAME: master BRANCH_NAME: master
run: | run: |
git checkout ${BRANCH_NAME} git checkout ${BRANCH_NAME}
bash ./tools/gitsync.sh pack bash ./tools/gitsync.sh pack
bash ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${GH_REF} bash -x ./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} ${CO_REF}
- name: Deploy Test test:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@master
- name: Pack And Deploy
env: env:
BRANCH_NAME: test BRANCH_NAME: test
run: | run: |
git checkout ${BRANCH_NAME} git checkout ${BRANCH_NAME}
bash ./tools/gitsync.sh pack bash ./tools/gitsync.sh pack
bash ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${GH_REF} bash -x ./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} ${CO_REF}
- name: Deploy Dev dev:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@master
- name: Pack And Deploy
env: env:
BRANCH_NAME: dev BRANCH_NAME: dev
run: | run: |
git checkout ${BRANCH_NAME} git checkout ${BRANCH_NAME}
bash ./tools/gitsync.sh pack bash ./tools/gitsync.sh pack
bash ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${GH_REF} bash -x ./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} ${CO_REF}

View File

@@ -40,10 +40,8 @@ pack_app() {
ls apps/$appname/bin 2> /dev/null | grep -E "${model}|^[a-z0-9-]{1,}[^_]$" | while read line; do 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}/} cp -rf apps/$appname/bin/$line pack/$appname/bin/${line/_${model}/}
done 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 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 mv -f ${appname}_${model}.tar.gz ./appstore
rm -rf pack/$appname/ rm -rf pack/$appname/
done done
@@ -64,6 +62,7 @@ pack() {
rm -rf appstore/ rm -rf appstore/
rm -rf mbfiles/ rm -rf mbfiles/
echo "开始打包插件..."
mkdir appstore mkdir appstore
ls apps/ | while read line; do ls apps/ | while read line; do
pack_app $line pack_app $line