Skip to content

Commit

Permalink
all good
Browse files Browse the repository at this point in the history
  • Loading branch information
agramfort committed Apr 21, 2020
1 parent 9b66b19 commit 3eed3ca
Showing 1 changed file with 19 additions and 20 deletions.
39 changes: 19 additions & 20 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,24 +103,24 @@ jobs:
name: Deploy docs
command: |
set -e;
# if [ "${CIRCLE_BRANCH}" == "master" ]; then
git config --global user.email "[email protected]";
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 "[email protected]";
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
Expand All @@ -134,5 +134,4 @@ workflows:
filters:
branches:
only:
# - master
- doc_ci_build
- master

0 comments on commit 3eed3ca

Please sign in to comment.