Skip to content

Commit 5a918a3

Browse files
author
Sylvain MARIE
committed
Removed --dirty flag to re-enable client-slide search
1 parent e82b7f8 commit 5a918a3

1 file changed

Lines changed: 3 additions & 5 deletions

File tree

.travis.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,8 @@ after_success:
6262
- codecov
6363
#- pylint valid8 # note that at the moment the report is simply lost, we dont transform the result into anything
6464
# ***documentation***
65-
- mkdocs build -f docs/mkdocs.yml
66-
- cat ./site/search/search_index.json # trying to debug search
67-
- mv reports/junit site/
65+
# - mkdocs build -f docs/mkdocs.yml
66+
- mv reports/junit docs/ # not in site/ anymore so that we do not need to use --dirty (it breaks client-side search)
6867
# mkdocs gh-deploy requires special care :
6968
# ---grant the possibility to push on the repo---
7069
- openssl aes-256-cbc -K $encrypted_d1cad2cea12e_key -iv $encrypted_d1cad2cea12e_iv -in ci_tools/github_travis_rsa.enc -out ci_tools/github_travis_rsa -d
@@ -79,8 +78,7 @@ after_success:
7978
git remote add gh-remote "${GH_REF}";
8079
git fetch gh-remote && git fetch gh-remote gh-pages:gh-pages; # make sure we have the latest gh-remote
8180
# push but only if this is not a build triggered by a pull request
82-
# note: here we use the --dirty flag so that mkdocs does not clean the additional reports that we copied in the site
83-
if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_PYTHON_VERSION}" = "3.5" ]; then echo "Pushing to github"; PYTHONPATH=valid8/ mkdocs gh-deploy -v --dirty -f docs/mkdocs.yml --remote-name gh-remote; git push gh-remote gh-pages; fi;
81+
if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_PYTHON_VERSION}" = "3.5" ]; then echo "Pushing to github"; PYTHONPATH=valid8/ mkdocs gh-deploy -v -f docs/mkdocs.yml --remote-name gh-remote; git push gh-remote gh-pages; fi;
8482
else
8583
echo "File 'ci_tools/github_travis_rsa' has not been created, please check your encrypted repo token in .travis.yml, on the line starting with 'openssl aes-256-cbc...'"
8684
fi

0 commit comments

Comments
 (0)