← Back to team overview

widelands-dev team mailing list archive

[Merge] lp:~widelands-dev/widelands/fix-sphinx into lp:widelands

 

GunChleoc has proposed merging lp:~widelands-dev/widelands/fix-sphinx into lp:widelands.

Commit message:
Remove sphinx from debug builds on Travis.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1792291 in widelands: "Sphinx is broken on Travis"
  https://bugs.launchpad.net/widelands/+bug/1792291

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/fix-sphinx/+merge/354827

We need our Travis back ASAP, so I have uncommented the Sphinx build for now. I can't get my system to cooperate and use the current version of Sphinx, so I can't reproduce the error.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix-sphinx into lp:widelands.
=== modified file '.travis.sh'
--- .travis.sh	2017-11-27 20:16:11 +0000
+++ .travis.sh	2018-09-13 05:06:42 +0000
@@ -30,17 +30,18 @@
 if [ "$BUILD_TYPE" == "Debug" ]; then
 
    # Build the documentation. Any warning is an error.
-   if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-     sudo pip install sphinx
-   fi
-   if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-     pip2 install sphinx
-   fi
-   pushd ../doc/sphinx
-   mkdir source/_static
-   ./extract_rst.py
-   sphinx-build -W -b json -d build/doctrees source build/json
-   popd
+   # TODO: GunChleoc: Currently broken
+   #if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+   #  sudo pip install sphinx
+   #fi
+   #if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+   #  pip2 install sphinx
+   #fi
+   #pushd ../doc/sphinx
+   #mkdir source/_static
+   #./extract_rst.py
+   #sphinx-build -W -b json -d build/doctrees source build/json
+   #popd
 
    # Run the codecheck test suite.
    pushd ../cmake/codecheck


Follow ups