Skip to content
Permalink
Browse files
Move ci to .ci
  • Loading branch information
m-kuhn committed Apr 27, 2017
1 parent 60accc9 commit c28e34485304875f2cb5341bdc2c42e44980b487
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -18,5 +18,5 @@ export CORES=2
mkdir build
cd build

cmake ../ci/travis/code_layout
cmake ../.ci/travis/code_layout
make -j${CORES}
File renamed without changes.
File renamed without changes.
@@ -31,7 +31,7 @@ mkdir /home/travis/osgeo4travis
pushd depcache
# Download newer version of cmake than in the repository
[[ -f cmake-3.5.0-Linux-x86_64.tar.gz ]] || curl -s -S -O https://cmake.org/files/v3.5/cmake-3.5.0-Linux-x86_64.tar.gz
tar --strip-components=1 -zx -f cmake-3.5.0-Linux-x86_64.tar.gz -C /home/travis/osgeo4travis
tar --strip-components=1 -zx -f cmake-3.5.0-Linux-x86_64.tar.gz -C /home/travis/osgeo4travis

# Download OTB package for Processing tests
[[ -f OTB-5.6.0-Linux64.run ]] || curl -s -S -O https://www.orfeo-toolbox.org/packages/archives/OTB/OTB-5.6.0-Linux64.run
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -28,12 +28,5 @@ export LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so

export CTEST_BUILD_COMMAND="/usr/bin/make -j3 -i -k"

# xvfb-run ctest -V -E "qgis_openstreetmaptest|qgis_wcsprovidertest" -S ./qgis-test-travis.ctest --output-on-failure
if [ "$CACHE_WARMING" = true ] ; then
echo "WARNING: CACHE WARMING IS ACTIVE. SET CACHE_WARMING=false TO GET MEANINGFUL RESULTS."
xvfb-run ctest -V -R NOTESTS -S ./qgis-test-travis.ctest --output-on-failure
false
else
python ${TRAVIS_BUILD_DIR}/ci/travis/scripts/ctest2travis.py \
xvfb-run ctest -V -E "$(cat ${DIR}/blacklist.txt | sed -r '/^(#.*?)?$/d' | paste -sd '|' -)" -S ${DIR}/../qgis-test-travis.ctest --output-on-failure
fi
python ${TRAVIS_BUILD_DIR}/.ci/travis/scripts/ctest2travis.py \
xvfb-run ctest -V -E "$(cat ${DIR}/blacklist.txt | sed -r '/^(#.*?)?$/d' | paste -sd '|' -)" -S ${DIR}/../qgis-test-travis.ctest --output-on-failure
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -92,16 +92,16 @@ notifications:
on_start: never # default: never

before_install:
- ./ci/travis/${TRAVIS_CONFIG}/before_install.sh
- ./.ci/travis/${TRAVIS_CONFIG}/before_install.sh

install:
- ./ci/travis/${TRAVIS_CONFIG}/install.sh
- ./.ci/travis/${TRAVIS_CONFIG}/install.sh

before_script:
- ./ci/travis/${TRAVIS_CONFIG}/before_script.sh
- ./.ci/travis/${TRAVIS_CONFIG}/before_script.sh

script:
- ./ci/travis/${TRAVIS_CONFIG}/script.sh
- ./.ci/travis/${TRAVIS_CONFIG}/script.sh

after_script:
- ./ci/travis/${TRAVIS_CONFIG}/after_script.sh
- ./.ci/travis/${TRAVIS_CONFIG}/after_script.sh

0 comments on commit c28e344

Please sign in to comment.