travis: give up and just do clang++/release
This commit is contained in:
parent
0cf9498d21
commit
d09765ad08
1 changed files with 3 additions and 3 deletions
|
@ -2,11 +2,11 @@ language: cpp
|
||||||
|
|
||||||
compiler:
|
compiler:
|
||||||
- clang
|
- clang
|
||||||
- gcc
|
#- gcc
|
||||||
|
|
||||||
env:
|
env:
|
||||||
matrix:
|
matrix:
|
||||||
- DEBUG=True ENABLE_LOG=True DEFAULT_LOG_SEVERITY=debug XMLPARSER="libxml2" DEMO=False BENCHMARK=False CUSTOM_CXXFLAGS="" CUSTOM_LDFLAGS=""
|
#- DEBUG=True ENABLE_LOG=True DEFAULT_LOG_SEVERITY=debug XMLPARSER="libxml2" DEMO=False BENCHMARK=False CUSTOM_CXXFLAGS="" CUSTOM_LDFLAGS=""
|
||||||
- DEBUG=False ENABLE_LOG=False DEFAULT_LOG_SEVERITY=none XMLPARSER="ptree" DEMO=False BENCHMARK=False CUSTOM_CXXFLAGS="" CUSTOM_LDFLAGS=""
|
- DEBUG=False ENABLE_LOG=False DEFAULT_LOG_SEVERITY=none XMLPARSER="ptree" DEMO=False BENCHMARK=False CUSTOM_CXXFLAGS="" CUSTOM_LDFLAGS=""
|
||||||
|
|
||||||
# travis + ubuntugis with gdal and postggis leads to many potential dead-end conflicts
|
# travis + ubuntugis with gdal and postggis leads to many potential dead-end conflicts
|
||||||
|
@ -47,7 +47,7 @@ before_script:
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- ./configure CXX="${CXX}" CC="${CC}" CUSTOM_CXXFLAGS="${CUSTOM_CXXFLAGS}" CUSTOM_LDFLAGS="${CUSTOM_LDFLAGS}" XML_PARSER="${XML_PARSER}" ENABLE_LOG="${ENABLE_LOG}" DEBUG="${DEBUG}" DEMO="${DEMO}" BENCHMARK="${BENCHMARK}" CPP_TESTS=True CAIRO=True FAST=True || cat config.log
|
- ./configure CXX="${CXX}" CC="${CC}" CUSTOM_CXXFLAGS="${CUSTOM_CXXFLAGS}" CUSTOM_LDFLAGS="${CUSTOM_LDFLAGS}" XML_PARSER="${XML_PARSER}" ENABLE_LOG="${ENABLE_LOG}" DEBUG="${DEBUG}" DEMO="${DEMO}" BENCHMARK="${BENCHMARK}" CPP_TESTS=True CAIRO=True FAST=True || cat config.log
|
||||||
#- if [[ "${DEBUG}" == True ]]; then export JOBS=$((JOBS/2)); fi;
|
- if [[ "${DEBUG}" == True ]]; then export JOBS=$((JOBS/2)); fi;
|
||||||
- make
|
- make
|
||||||
- git clone https://github.com/mapbox/mapnik-test-data tests/data/mapnik-test-data
|
- git clone https://github.com/mapbox/mapnik-test-data tests/data/mapnik-test-data
|
||||||
- make test
|
- make test
|
||||||
|
|
Loading…
Reference in a new issue