Merge branch 'master' into dev

This commit is contained in:
Kristian Haugene
2019-10-13 18:51:33 +02:00

View File

@@ -83,6 +83,21 @@ jobs:
name: Push image
command: docker push $IMAGE_NAME:$IMAGE_TAG
build-and-deploy-gh-pages:
docker:
- image: circleci/python:3.7
steps:
- checkout
- run:
name: "Set Git name for commits"
command: git config --global user.name "CircleCI"
- run:
name: "Install Mkdocs and Material theme"
command: pip install --user mkdocs mkdocs-material
- run:
name: "Build and push site"
command: mkdocs gh-deploy --message "Deployed {sha} with MkDocs version {version}. [skip ci]"
workflows:
version: 2
build-images:
@@ -107,3 +122,9 @@ workflows:
only:
- master
- dev
documentation-update:
jobs:
- build-and-deploy-gh-pages:
filters:
branches:
only: master