Skip to content

Commit

Permalink
Merge pull request #192 from 10up/fix/combine-master-actions
Browse files Browse the repository at this point in the history
Move doc deploy action to the release workflow
  • Loading branch information
helen authored Mar 6, 2020
2 parents bdee8d4 + 2992c9e commit 8e17d33
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 30 deletions.
28 changes: 0 additions & 28 deletions .github/workflows/build-docs.yml

This file was deleted.

11 changes: 9 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
branches:
- master
jobs:
master:
release:
name: Push (merge) to master
runs-on: ubuntu-latest
steps:
Expand All @@ -13,7 +13,7 @@ jobs:
- name: Set Node.js 10.x
uses: actions/setup-node@master
with:
version: 10.x
node-version: 10.x
- name: npm install and build
run: |
npm install
Expand All @@ -22,3 +22,10 @@ jobs:
uses: ./.github/action-release/
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Build docs
run: npm run build:docs
- name: Deploy docs update
uses: maxheld83/ghpages@v0.2.1
env:
BUILD_DIR: 'docs/'
GH_PAT: ${{ secrets.GH_PAT }}

0 comments on commit 8e17d33

Please sign in to comment.