diff --git a/.travis.yml b/.travis.yml index c1e8519c52..cfcec4ace3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ jobs: include: - dist: trusty compiler: gcc - env: wxGTK_VERSION=2 wxUSE_XVFB=1 + env: wxGTK_VERSION=2 wxUSE_XVFB=1 wxUSE_DOCKER_HTTPBIN=1 name: wxGTK 2 Ubuntu 14.04 - dist: bionic compiler: gcc diff --git a/build/tools/travis-ci.sh b/build/tools/travis-ci.sh index a91947b1dc..18dbcc0d0d 100755 --- a/build/tools/travis-ci.sh +++ b/build/tools/travis-ci.sh @@ -16,10 +16,9 @@ launch_httpbin() { echo 'travis_fold:start:httpbin' echo 'Running httpbin...' - # Prefer to use docker if it's available as it's more robust than dealing - # with pip -- but we need to have a fallback as at least Mac builds don't - # have docker. - if command -v docker; then + # Use docker if configured to do so, this works around Python/pip problems + # on some platforms. + if [ "$wxUSE_DOCKER_HTTPBIN" = 1 ]; then docker pull kennethreitz/httpbin docker run -d -p 80:80 kennethreitz/httpbin WX_TEST_WEBREQUEST_URL="http://localhost"