Merge branch 'master' into 3.0

This commit is contained in:
grossmj 2020-10-24 15:53:44 +10:30
commit 34f05e92d5

View File

@ -3,8 +3,6 @@ name: publish-api-documentation
on: on:
workflow_dispatch: workflow_dispatch:
push: push:
branches:
- 3.0
tags: tags:
- v3.* - v3.*
@ -36,8 +34,9 @@ jobs:
run: | run: |
git config user.name github-actions git config user.name github-actions
git config user.email github-actions@github.com git config user.email github-actions@github.com
git checkout gh-pages
git add docs git add docs
git status git status
git commit -m "Publish API documentation" git commit -m "Publish API documentation"
git checkout gh-pages
git merge 3.0
git push git push