Skip to content

Commit

Permalink
Merge branch 'baagaard/add-release-1.9.8'
Browse files Browse the repository at this point in the history
* baagaard/add-release-1.9.8:
  Add documentation comment.
  Make scripts executable.
  Try adding clang compiler.
  • Loading branch information
baagaard-usgs committed Mar 24, 2017
2 parents cdfd682 + 3abad48 commit dde1e9a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion .travis.yml
Expand Up @@ -4,10 +4,16 @@ sudo: false

language: cpp

# :TODO: @brad Add osx build (need homebrew packages)..
matrix:
include:
- os: linux
env: LD_LIBRARY_PATH="${DEPS_DIR}/lib:${TARGET_DIR}/lib:${LD_LIBRARY_PATH}"
compiler: gcc
- os: linux
env: LD_LIBRARY_PATH="${DEPS_DIR}/lib:${TARGET_DIR}/lib:${LD_LIBRARY_PATH}"
compiler: clang


# Limit number of commits in cloning (but keep enough so that 'git describe' works)
git:
Expand Down Expand Up @@ -38,7 +44,7 @@ script:

env:
global:
- MAKE_THREADS=2
- MAKE_THREADS=$(nproc)
- PYTHON_VERSION="2.7"
- DEPS_DIR="${TRAVIS_BUILD_DIR}/dist/deps"
- TARGET_DIR="${TRAVIS_BUILD_DIR}/dist/target"
Expand Down
Empty file modified tests/libtests/spatialdb/data/generate.sh 100644 → 100755
Empty file.
Empty file modified travis/dependencies.sh 100644 → 100755
Empty file.

0 comments on commit dde1e9a

Please sign in to comment.