From 866fddc73f9b43f227120bb240afeb43c38cdf2f Mon Sep 17 00:00:00 2001 From: chenshuai2144 Date: Sun, 1 Mar 2020 16:38:00 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=B7=20CI:=20update=20workflows?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 16 ++++++++++------ .github/workflows/issue-reference.yml | 2 +- .github/workflows/rebase.yml | 6 ------ 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fb3e51eb..e3b2304a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,13 +25,17 @@ jobs: PROGRESS: none NODE_ENV: test NODE_OPTIONS: --max_old_space_size=4096 - deploy: - name: Deploy to GitHub Pages + build-and-deploy: runs-on: ubuntu-latest - if: success() && github.event == 'push' && github.ref == 'master' + if: github.event == 'push' && github.ref == 'master' steps: - - name: publish - uses: maxheld83/ghpages@v0.2.1 + - name: Checkout + uses: actions/checkout@master + + - name: Build and Deploy + uses: JamesIves/github-pages-deploy-action@master env: - BUILD_DIR: 'dist/' GITHUB_TOKEN: ${{ secrets.ACTION_TOKEN }} + BRANCH: gh-pages + FOLDER: "dist/" + BUILD_SCRIPT: npm install && npm run deploy diff --git a/.github/workflows/issue-reference.yml b/.github/workflows/issue-reference.yml index 882378df..a0ff416a 100644 --- a/.github/workflows/issue-reference.yml +++ b/.github/workflows/issue-reference.yml @@ -1,4 +1,4 @@ -name: 'Issue ref' +name: "Issue ref" on: pull_request: diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml index 85dc5606..f9a33238 100644 --- a/.github/workflows/rebase.yml +++ b/.github/workflows/rebase.yml @@ -15,9 +15,3 @@ jobs: uses: cirrus-actions/rebase@1.2 env: GITHUB_TOKEN: ${{ secrets.ACTION_TOKEN }} - always_job: - name: Always run job - runs-on: ubuntu-latest - steps: - - name: Always run - run: echo "This job is used to prevent the workflow to fail when all other jobs are skipped."