2020-03-05 19:07:04

This commit is contained in:
monlor
2020-03-05 19:07:04 +08:00
parent 72fd790abd
commit 2e0f81be7a
2 changed files with 4 additions and 6 deletions

View File

@@ -10,7 +10,7 @@ env:
CO_REF: ${{ secrets.CO_REF }} CO_REF: ${{ secrets.CO_REF }}
jobs: jobs:
master: master-job:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout
@@ -25,7 +25,7 @@ jobs:
bash -x ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${GH_REF} bash -x ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${GH_REF}
bash -x ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${CO_REF} bash -x ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${CO_REF}
test: test-job:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout
@@ -40,7 +40,7 @@ jobs:
bash -x ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${GH_REF} bash -x ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${GH_REF}
bash -x ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${CO_REF} bash -x ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${CO_REF}
dev: dev-job:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout

View File

@@ -102,7 +102,6 @@ reset() {
# $1: path to push # $1: path to push
# $2: remote branch name # $2: remote branch name
# $3: remote url with token # $3: remote url with token
# $4: git extra param
deploy() { deploy() {
cd $1 cd $1
@@ -111,8 +110,7 @@ deploy() {
git config --local user.name "monlor" git config --local user.name "monlor"
git add . git add .
git commit -m "$(TZ='Asia/Shanghai' date "+%Y-%m-%d %H:%M:%S")" -a git commit -m "$(TZ='Asia/Shanghai' date "+%Y-%m-%d %H:%M:%S")" -a
git push "$3" master:"$2" -f "$4" git push "$3" master:"$2" -f
git push "$3" master:"$2" -f "$4"
} }