diff options
Diffstat (limited to '.circleci/config.yml')
| -rw-r--r-- | .circleci/config.yml | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 85f8073..32c211f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -106,8 +106,10 @@ jobs: echo "Deploying dev docs for ${CIRCLE_BRANCH}."; cd master cp -a /tmp/build/html/* .; + cp -a /tmp/build/html/.github .github; touch .nojekyll; git add -A; + git add -f .github/*.html ; git commit -m "CircleCI update of dev docs (${CIRCLE_BUILD_NUM})."; git push origin master; else @@ -134,24 +136,23 @@ jobs: name: Deploy docs command: | set -e; - if [ "${CIRCLE_BRANCH}" == "master" ]; then - git config --global user.email "circle@PythonOT.com"; - git config --global user.name "Circle CI"; - cd ~/PythonOT.github.io; - git checkout master - git remote -v - git fetch origin - git reset --hard origin/master - git clean -xdf - echo "Deploying dev docs for ${CIRCLE_BRANCH}."; - cp -a /tmp/build/html/* .; - touch .nojekyll; - git add -A; - git commit -m "CircleCI update of dev docs (${CIRCLE_BUILD_NUM})."; - git push origin master; - else - echo "No deployment (build: ${CIRCLE_BRANCH})."; - fi + git config --global user.email "circle@PythonOT.com"; + git config --global user.name "Circle CI"; + cd ~/PythonOT.github.io; + git checkout master + git remote -v + git fetch origin + git reset --hard origin/master + git clean -xdf + echo "Deploying dev docs for ${CIRCLE_BRANCH}."; + cp -a /tmp/build/html/* .; + cp -a /tmp/build/html/.github .github; + touch .nojekyll; + git add -A; + git add -f .github/*.html ; + git commit -m "CircleCI update of dev docs (${CIRCLE_BUILD_NUM})."; + git push origin master; + workflows: |