summaryrefslogtreecommitdiff
path: root/.circleci
diff options
context:
space:
mode:
authorAlexandre Gramfort <alexandre.gramfort@m4x.org>2020-04-21 12:25:36 +0200
committerAlexandre Gramfort <alexandre.gramfort@m4x.org>2020-04-21 12:25:36 +0200
commit3eed3cad36ec5f5691dc029853bc36bfad5ee389 (patch)
tree3fb445a4eb86014686d71c6a17b929caf8afe655 /.circleci
parent9b66b194cdfc6b7e4b35488fa093d936fa08e011 (diff)
all good
Diffstat (limited to '.circleci')
-rw-r--r--.circleci/config.yml39
1 files changed, 19 insertions, 20 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index ea5981e..9701ad1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -103,24 +103,24 @@ 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
+ 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
workflows:
version: 2
@@ -134,5 +134,4 @@ workflows:
filters:
branches:
only:
- # - master
- - doc_ci_build
+ - master