diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | tools/travis/linux_install.sh | 11 | ||||
| -rwxr-xr-x | tools/travis/script.sh | 4 |
3 files changed, 13 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 90125c2d..5d3a2760 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,7 +69,7 @@ matrix: - libgdal-dev - graphviz - os: osx - osx_image: xcode9.3 + osx_image: xcode8.3 language: generic env: - TRAVIS_PYTHON_VERSION=3.6.1 diff --git a/tools/travis/linux_install.sh b/tools/travis/linux_install.sh index 6119e1ab..821a1154 100755 --- a/tools/travis/linux_install.sh +++ b/tools/travis/linux_install.sh @@ -12,7 +12,16 @@ if [[ "${OPTIONAL_DEPS}" == 1 ]]; then export C_INCLUDE_PATH=/usr/include/gdal # needed for view_graphviz and default_opener - alias xdg-open="file" + DIR=~/.local/bin + export PATH=$DIR:$PATH + mkdir -p $DIR + FILE=$DIR/xdg-open + cat <<EOF >$FILE +#!/bin/sh + +echo $1 +EOF + chmod +x $FILE fi diff --git a/tools/travis/script.sh b/tools/travis/script.sh index b2f9f06b..108ffe89 100755 --- a/tools/travis/script.sh +++ b/tools/travis/script.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set -ex +set -e section "Script section" @@ -34,4 +34,4 @@ cd $NX_SOURCE section_end "Script section" -set +ex +set +e |