Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Temporarily disable missing llvm apt repo
- Loading branch information
Showing
with
20 additions
and
11 deletions.
-
+7
−5
.travis.yml
-
+7
−3
ci/travis/linux/qt4/install.sh
-
+6
−3
ci/travis/linux/qt5/install.sh
|
@@ -9,7 +9,7 @@ matrix: |
|
|
env: |
|
|
- BUILD=qt4 |
|
|
- QT_VERSION=4 |
|
|
- LLVM_VERSION=3.8 |
|
|
# - LLVM_VERSION=3.8 |
|
|
sudo: false |
|
|
cache: |
|
|
apt: true |
|
@@ -20,12 +20,13 @@ matrix: |
|
|
postgresql: "9.4" |
|
|
apt: |
|
|
sources: |
|
|
- llvm-toolchain-precise-3.8 |
|
|
# - llvm-toolchain-precise-3.8 |
|
|
- ubuntu-toolchain-r-test |
|
|
- george-edison55-precise-backports # doxygen 1.8.3 |
|
|
packages: |
|
|
- bison |
|
|
- clang-3.8 |
|
|
- gcc-6 |
|
|
- g++-6 |
|
|
- doxygen |
|
|
- flex |
|
|
- flip |
|
@@ -74,7 +75,7 @@ matrix: |
|
|
postgresql: "9.4" |
|
|
apt: |
|
|
sources: |
|
|
- llvm-toolchain-precise-3.8 |
|
|
# - llvm-toolchain-precise-3.8 |
|
|
- ubuntu-toolchain-r-test |
|
|
- george-edison55-precise-backports # doxygen 1.8.3 |
|
|
packages: |
|
@@ -90,7 +91,8 @@ matrix: |
|
|
- txt2tags |
|
|
- xvfb |
|
|
- flip |
|
|
- clang-3.8 |
|
|
- gcc-6 |
|
|
- g++-6 |
|
|
# OSX based build with QT4 and Python 2 |
|
|
- os: osx |
|
|
env: |
|
|
|
@@ -21,15 +21,19 @@ ln -s ${HOME}/osgeo4travis/bin/ccache ${HOME}/osgeo4travis/bin/clang-${LLVM_VERS |
|
|
|
|
|
ccache -s |
|
|
|
|
|
export CXX="clang++-${LLVM_VERSION}" |
|
|
export CC="clang-${LLVM_VERSION}" |
|
|
#export CXX="clang++-${LLVM_VERSION}" |
|
|
#export CC="clang-${LLVM_VERSION}" |
|
|
export CXX="g++-6" |
|
|
export CC="gcc-6" |
|
|
|
|
|
export PATH=${HOME}/osgeo4travis/bin:${PATH} |
|
|
|
|
|
cmake --version |
|
|
${CC} --version |
|
|
${CXX} --version |
|
|
|
|
|
CLANG_WARNINGS="-Wimplicit-fallthrough" |
|
|
# CLANG_WARNINGS="-Wimplicit-fallthrough" |
|
|
CLANG_WARNINGS="" |
|
|
|
|
|
cmake -DWITH_SERVER=ON \ |
|
|
-DCMAKE_PREFIX_PATH=/home/travis/osgeo4travis \ |
|
|
|
@@ -21,16 +21,19 @@ ln -s ${HOME}/osgeo4travis/bin/ccache ${HOME}/osgeo4travis/bin/clang-${LLVM_VERS |
|
|
|
|
|
ccache -s |
|
|
|
|
|
export CXX="clang++-${LLVM_VERSION}" |
|
|
export CC="clang-${LLVM_VERSION}" |
|
|
#export CXX="clang++-${LLVM_VERSION}" |
|
|
#export CC="clang-${LLVM_VERSION}" |
|
|
export CXX="g++-6" |
|
|
export CC="gcc-6" |
|
|
export PATH=${HOME}/osgeo4travis/bin:${PATH} |
|
|
export PYTHONPATH=${HOME}/osgeo4travis/lib/python3.3/site-packages/ |
|
|
|
|
|
cmake --version |
|
|
${CC} --version |
|
|
${CXX} --version |
|
|
|
|
|
CLANG_WARNINGS="-Wimplicit-fallthrough" |
|
|
# CLANG_WARNINGS="-Wimplicit-fallthrough" |
|
|
CLANG_WARNINGS="" |
|
|
|
|
|
# Include this line for debug reasons |
|
|
# -DCMAKE_BUILD_TYPE=RelWithDebInfo \ |
|
|