Move ci to .ci

qgis · Apr 27, 2017 · c28e344 · c28e344
1 parent 60accc9
commit c28e344
Show file tree

Hide file tree

Showing 21 changed files with 9 additions and 16 deletions.
diff --git a/ci/travis/code_layout/CMakeLists.txt → .ci/travis/code_layout/CMakeLists.txt b/ci/travis/code_layout/CMakeLists.txt → .ci/travis/code_layout/CMakeLists.txt
diff --git a/ci/travis/code_layout/after_script.sh → .ci/travis/code_layout/after_script.sh b/ci/travis/code_layout/after_script.sh → .ci/travis/code_layout/after_script.sh
diff --git a/ci/travis/code_layout/before_install.sh → .ci/travis/code_layout/before_install.sh b/ci/travis/code_layout/before_install.sh → .ci/travis/code_layout/before_install.sh
diff --git a/ci/travis/code_layout/before_script.sh → .ci/travis/code_layout/before_script.sh b/ci/travis/code_layout/before_script.sh → .ci/travis/code_layout/before_script.sh
diff --git a/ci/travis/code_layout/install.sh → .ci/travis/code_layout/install.sh b/ci/travis/code_layout/install.sh → .ci/travis/code_layout/install.sh
@@ -18,5 +18,5 @@ export CORES=2
 mkdir build
 cd build
 
-cmake ../ci/travis/code_layout
+cmake ../.ci/travis/code_layout
 make -j${CORES}
diff --git a/ci/travis/code_layout/script.sh → .ci/travis/code_layout/script.sh b/ci/travis/code_layout/script.sh → .ci/travis/code_layout/script.sh
diff --git a/ci/travis/linux/after_script.sh → .ci/travis/linux/after_script.sh b/ci/travis/linux/after_script.sh → .ci/travis/linux/after_script.sh
diff --git a/ci/travis/linux/before_install.sh → .ci/travis/linux/before_install.sh b/ci/travis/linux/before_install.sh → .ci/travis/linux/before_install.sh
@@ -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

diff --git a/ci/travis/linux/before_script.sh → .ci/travis/linux/before_script.sh b/ci/travis/linux/before_script.sh → .ci/travis/linux/before_script.sh
diff --git a/ci/travis/linux/blacklist.txt → .ci/travis/linux/blacklist.txt b/ci/travis/linux/blacklist.txt → .ci/travis/linux/blacklist.txt
diff --git a/ci/travis/linux/install.sh → .ci/travis/linux/install.sh b/ci/travis/linux/install.sh → .ci/travis/linux/install.sh
diff --git a/ci/travis/linux/script.sh → .ci/travis/linux/script.sh b/ci/travis/linux/script.sh → .ci/travis/linux/script.sh
@@ -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
diff --git a/ci/travis/macos/after_script.sh → .ci/travis/macos/after_script.sh b/ci/travis/macos/after_script.sh → .ci/travis/macos/after_script.sh
diff --git a/ci/travis/macos/before_install.sh → .ci/travis/macos/before_install.sh b/ci/travis/macos/before_install.sh → .ci/travis/macos/before_install.sh
diff --git a/ci/travis/macos/before_script.sh → .ci/travis/macos/before_script.sh b/ci/travis/macos/before_script.sh → .ci/travis/macos/before_script.sh
diff --git a/ci/travis/macos/blacklist.txt → .ci/travis/macos/blacklist.txt b/ci/travis/macos/blacklist.txt → .ci/travis/macos/blacklist.txt
diff --git a/ci/travis/macos/install.sh → .ci/travis/macos/install.sh b/ci/travis/macos/install.sh → .ci/travis/macos/install.sh
diff --git a/ci/travis/macos/script.sh → .ci/travis/macos/script.sh b/ci/travis/macos/script.sh → .ci/travis/macos/script.sh
diff --git a/ci/travis/scripts/ctest2travis.py → .ci/travis/scripts/ctest2travis.py b/ci/travis/scripts/ctest2travis.py → .ci/travis/scripts/ctest2travis.py
diff --git a/ci/travis/travis.ctest → .ci/travis/travis.ctest b/ci/travis/travis.ctest → .ci/travis/travis.ctest
diff --git a/.travis.yml b/.travis.yml
@@ -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