From 2e0f81be7abd0f97fe9cba04a7d2d012cadc3f37 Mon Sep 17 00:00:00 2001 From: monlor Date: Thu, 5 Mar 2020 19:07:04 +0800 Subject: [PATCH] 2020-03-05 19:07:04 --- .github/workflows/tag.yaml | 6 +++--- tools/gitsync.sh | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tag.yaml b/.github/workflows/tag.yaml index c66acec..7dc7d6c 100644 --- a/.github/workflows/tag.yaml +++ b/.github/workflows/tag.yaml @@ -10,7 +10,7 @@ env: CO_REF: ${{ secrets.CO_REF }} jobs: - master: + master-job: runs-on: ubuntu-latest steps: - 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} ${CO_REF} - test: + test-job: runs-on: ubuntu-latest steps: - 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} ${CO_REF} - dev: + dev-job: runs-on: ubuntu-latest steps: - name: Checkout diff --git a/tools/gitsync.sh b/tools/gitsync.sh index f51e22c..824c7c4 100755 --- a/tools/gitsync.sh +++ b/tools/gitsync.sh @@ -102,7 +102,6 @@ reset() { # $1: path to push # $2: remote branch name # $3: remote url with token -# $4: git extra param deploy() { cd $1 @@ -111,8 +110,7 @@ deploy() { git config --local user.name "monlor" git add . 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 "$4" + git push "$3" master:"$2" -f }