Skip to content

Commit dde1e9a

Browse files
committed
Merge branch 'baagaard/add-release-1.9.8'
* baagaard/add-release-1.9.8: Add documentation comment. Make scripts executable. Try adding clang compiler.
2 parents cdfd682 + 3abad48 commit dde1e9a

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

.travis.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,16 @@ sudo: false
44

55
language: cpp
66

7+
# :TODO: @brad Add osx build (need homebrew packages)..
78
matrix:
89
include:
910
- os: linux
1011
env: LD_LIBRARY_PATH="${DEPS_DIR}/lib:${TARGET_DIR}/lib:${LD_LIBRARY_PATH}"
12+
compiler: gcc
13+
- os: linux
14+
env: LD_LIBRARY_PATH="${DEPS_DIR}/lib:${TARGET_DIR}/lib:${LD_LIBRARY_PATH}"
15+
compiler: clang
16+
1117

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

3945
env:
4046
global:
41-
- MAKE_THREADS=2
47+
- MAKE_THREADS=$(nproc)
4248
- PYTHON_VERSION="2.7"
4349
- DEPS_DIR="${TRAVIS_BUILD_DIR}/dist/deps"
4450
- TARGET_DIR="${TRAVIS_BUILD_DIR}/dist/target"

tests/libtests/spatialdb/data/generate.sh

100644100755
File mode changed.

travis/dependencies.sh

100644100755
File mode changed.

0 commit comments

Comments
 (0)