Skip to content

Commit 80b3c49

Browse files
author
Sylvain MARIE
committed
Fixed documentation: client-side search is now enabled (removed --dirty flag following conversation in https://gitter.im/squidfunk/mkdocs-material and squidfunk/mkdocs-material#1279)
1 parent a75009c commit 80b3c49

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ after_success:
102102
# - pylint pytest_cases # note that at the moment the report is simply lost, we dont transform the result into anything
103103
# ***documentation***
104104
- mkdocs build -f docs/mkdocs.yml
105-
- mv reports/junit site/
105+
- mv reports/junit docs/ # not in site/ anymore so that we do not need to use --dirty (it breaks client-side search)
106106
# mkdocs gh-deploy requires special care :
107107
# ---grant the possibility to push on the repo---
108108
- openssl aes-256-cbc -K $encrypted_b1669b6e8c83_key -iv $encrypted_b1669b6e8c83_iv -in ci_tools/github_travis_rsa.enc -out ci_tools/github_travis_rsa -d
@@ -118,7 +118,8 @@ after_success:
118118
git fetch gh-remote && git fetch gh-remote gh-pages:gh-pages; # make sure we have the latest gh-remote
119119
# push but only if this is not a build triggered by a pull request
120120
# note: here we use the --dirty flag so that mkdocs does not clean the additional reports that we copied in the site
121-
if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_PYTHON_VERSION}" = "3.5" ] && [ "${PYTEST_VERSION}" = "<3" ]; then echo "Pushing to github"; PYTHONPATH=pytest_cases/ mkdocs gh-deploy -v --dirty -f docs/mkdocs.yml --remote-name gh-remote; git push gh-remote gh-pages; fi;
121+
# note: do not use the --dirty flag as it breaks client-side search
122+
if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_PYTHON_VERSION}" = "3.5" ] && [ "${PYTEST_VERSION}" = "<3" ]; then echo "Pushing to github"; PYTHONPATH=pytest_cases/ mkdocs gh-deploy -v -f docs/mkdocs.yml --remote-name gh-remote; git push gh-remote gh-pages; fi;
122123
else
123124
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...'"
124125
fi

0 commit comments

Comments
 (0)