diff options
| author | Marius Kintel <marius@kintel.net> | 2013-12-09 05:13:14 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-12-09 05:13:14 (GMT) |
| commit | a22394fc392451919f5b378ffe85dbeac7fd3a22 (patch) | |
| tree | 3d23413a96acb9ac4f0d5ad77f23569f4cdf71cb | |
| parent | 8f103043a280290802559ce8770c5984f7f0730a (diff) | |
Set upload env. variable in travis env since the cmake version on Travis is too old
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | scripts/travis-ci.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 9442ca4..5b9f215 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,8 @@ before_install: - sudo apt-get install -qq build-essential libqt4-dev libqt4-opengl-dev libxmu-dev cmake bison flex git-core libboost-all-dev libXi-dev libmpfr-dev libboost-dev libglew-dev libeigen2-dev libeigen3-dev libcgal-dev libgmp3-dev libgmp-dev python-paramiko curl imagemagick - sudo apt-get install -qq libopencsg-dev +env: OPENSCAD_UPLOAD_TESTS=yes + branches: only: - travis diff --git a/scripts/travis-ci.sh b/scripts/travis-ci.sh index 362c2df..9f44b0c 100755 --- a/scripts/travis-ci.sh +++ b/scripts/travis-ci.sh @@ -1,7 +1,7 @@ #!/bin/bash cd tests -cmake -DOPENSCAD_UPLOAD_TESTS=yes . +cmake . if [[ $? != 0 ]]; then echo "Error configuring test suite" exit 1 |