diff --git a/.travis.yml b/.travis.yml index 52adfa90f..97f452201 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,5 @@ +git: + depth: false matrix: fast_finish: true include: @@ -133,6 +135,9 @@ install: | cd .. popd fi + if [[ "$BUILD_PKG" == "linux-package" ]]; then + pip install sphinx + fi fi pkg-config --cflags harfbuzz if [[ "$TRAVIS_OS_NAME" != 'osx' ]]; then @@ -149,4 +154,5 @@ script: - if grep -Inr '\s$' kitty kitty_tests kittens docs *.py *.asciidoc *.rst .gitattributes .gitignore; then echo Trailing whitespace found, aborting.; exit 1; fi - if [[ -z $SANITIZE_ARG ]]; then $PYTHON test.py; else ./asan-launcher test.py; fi - if [[ "$RUN_FLAKE" == "1" ]]; then flake8 --count .; fi + - if [[ "$BUILD_PKG" == "linux-package" ]]; then make FAIL_WARN=-W man && make FAIL_WARN=-W html; fi - if [[ ! -z "$BUILD_PKG" ]]; then $PYTHON setup.py $BUILD_PKG; fi diff --git a/Makefile b/Makefile index 47f94c3d4..ad4e4722b 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ app: rendered_logo python3 setup.py kitty.app $(VVAL) man: - $(MAKE) -C docs man + $(MAKE) FAIL_WARN=$(FAIL_WARN) -C docs man html: - $(MAKE) -C docs html + $(MAKE) FAIL_WARN=$(FAIL_WARN) -C docs html diff --git a/docs/Makefile b/docs/Makefile index b7869aaed..0655df551 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -2,8 +2,8 @@ # # You can set these variables from the command line. -SPHINXOPTS = -T -W -SPHINXBUILD = kitty +launch /usr/bin/sphinx-build +SPHINXOPTS = -T $(FAIL_WARN) +SPHINXBUILD = python3 .. +launch $(shell which sphinx-build) SPHINXPROJ = kitty SOURCEDIR = . BUILDDIR = _build @@ -17,4 +17,4 @@ help: # Catch-all target: route all unknown targets to Sphinx using the new # "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS). %: Makefile - @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) + $(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) diff --git a/publish.py b/publish.py index b643320f6..b038e8d83 100755 --- a/publish.py +++ b/publish.py @@ -55,11 +55,11 @@ def run_tag(args): def run_man(args): - call('make man', cwd=docs_dir) + call('make FAIL_WARN=-W man', cwd=docs_dir) def run_html(args): - call('make html', cwd=docs_dir) + call('make FAIL_WARN=-W html', cwd=docs_dir) def run_website(args):