sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-13 00:03:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

use ninja and env var

Browse Source
This commit is contained in:
Denis Rouzaud 2017-08-07 20:32:00 +02:00 committed by Matthias Kuhn
parent 2098cfac02
commit 603375ed89
No known key found for this signature in database
GPG Key ID: A0E766808764D73F
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.ci/travis/linux/docker-build-test.sh
View File

@ -38,7 +38,7 @@ cmake \
export LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
export CTEST_BUILD_COMMAND="/usr/bin/make -j3 -i -k"
export CTEST_BUILD_COMMAND=ninja
python3 /root/QGIS/.ci/travis/scripts/ctest2travis.py xvfb-run ctest -V -E "$(cat /root/QGIS/.ci/travis/linux/blacklist.txt | sed -r '/^(#.*?)?$/d' | paste -sd '|' -)" -S /root/QGIS/.ci/travis/travis.ctest --output-on-failure

4
.ci/travis/travis.ctest
View File

@ -1,5 +1,5 @@
SET (CTEST_SOURCE_DIRECTORY /root/QGIS/build-docker)
SET (CTEST_BINARY_DIRECTORY /root/QGIS)
SET (CTEST_SOURCE_DIRECTORY $ENV{TRAVIS_BUILD_DIR})
SET (CTEST_BINARY_DIRECTORY $ENV{TRAVIS_BUILD_DIR}/build-docker)
#SET (CTEST_SOURCE_DIRECTORY /usr/src/QGIS)
#SET (CTEST_BINARY_DIRECTORY /usr/src/qgis-build)

2
.docker/docker-compose.travis.yml
View File

@ -13,7 +13,7 @@ services:
- postgres
environment:
- CCACHE_DIR=/root/.ccache
- TRAVIS_BUILD_DIR=${TRAVIS_BUILD_DIR}
- TRAVIS_BUILD_DIR=/root/QGIS
- TRAVIS_BRANCH=${TRAVIS_BRANCH}
- TRAVIS_PULL_REQUEST=${TRAVIS_PULL_REQUEST}
- TRAVIS_PULL_REQUEST_BRANCH=${TRAVIS_PULL_REQUEST_BRANCH}