Navigation Menu

Skip to content

Commit

Permalink
Temporarily disable missing llvm apt repo
Browse files Browse the repository at this point in the history
  • Loading branch information
m-kuhn committed Jun 3, 2016
1 parent 4c28661 commit c8011d9
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 11 deletions.
12 changes: 7 additions & 5 deletions .travis.yml
Expand Up @@ -9,7 +9,7 @@ matrix:
env: env:
- BUILD=qt4 - BUILD=qt4
- QT_VERSION=4 - QT_VERSION=4
- LLVM_VERSION=3.8 # - LLVM_VERSION=3.8
sudo: false sudo: false
cache: cache:
apt: true apt: true
Expand All @@ -20,12 +20,13 @@ matrix:
postgresql: "9.4" postgresql: "9.4"
apt: apt:
sources: sources:
- llvm-toolchain-precise-3.8 # - llvm-toolchain-precise-3.8
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- george-edison55-precise-backports # doxygen 1.8.3 - george-edison55-precise-backports # doxygen 1.8.3
packages: packages:
- bison - bison
- clang-3.8 - gcc-6
- g++-6
- doxygen - doxygen
- flex - flex
- flip - flip
Expand Down Expand Up @@ -74,7 +75,7 @@ matrix:
postgresql: "9.4" postgresql: "9.4"
apt: apt:
sources: sources:
- llvm-toolchain-precise-3.8 # - llvm-toolchain-precise-3.8
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- george-edison55-precise-backports # doxygen 1.8.3 - george-edison55-precise-backports # doxygen 1.8.3
packages: packages:
Expand All @@ -90,7 +91,8 @@ matrix:
- txt2tags - txt2tags
- xvfb - xvfb
- flip - flip
- clang-3.8 - gcc-6
- g++-6
# OSX based build with QT4 and Python 2 # OSX based build with QT4 and Python 2
- os: osx - os: osx
env: env:
Expand Down
10 changes: 7 additions & 3 deletions ci/travis/linux/qt4/install.sh
Expand Up @@ -21,15 +21,19 @@ ln -s ${HOME}/osgeo4travis/bin/ccache ${HOME}/osgeo4travis/bin/clang-${LLVM_VERS


ccache -s ccache -s


export CXX="clang++-${LLVM_VERSION}" #export CXX="clang++-${LLVM_VERSION}"
export CC="clang-${LLVM_VERSION}" #export CC="clang-${LLVM_VERSION}"
export CXX="g++-6"
export CC="gcc-6"

export PATH=${HOME}/osgeo4travis/bin:${PATH} export PATH=${HOME}/osgeo4travis/bin:${PATH}


cmake --version cmake --version
${CC} --version ${CC} --version
${CXX} --version ${CXX} --version


CLANG_WARNINGS="-Wimplicit-fallthrough" # CLANG_WARNINGS="-Wimplicit-fallthrough"
CLANG_WARNINGS=""


cmake -DWITH_SERVER=ON \ cmake -DWITH_SERVER=ON \
-DCMAKE_PREFIX_PATH=/home/travis/osgeo4travis \ -DCMAKE_PREFIX_PATH=/home/travis/osgeo4travis \
Expand Down
9 changes: 6 additions & 3 deletions ci/travis/linux/qt5/install.sh
Expand Up @@ -21,16 +21,19 @@ ln -s ${HOME}/osgeo4travis/bin/ccache ${HOME}/osgeo4travis/bin/clang-${LLVM_VERS


ccache -s ccache -s


export CXX="clang++-${LLVM_VERSION}" #export CXX="clang++-${LLVM_VERSION}"
export CC="clang-${LLVM_VERSION}" #export CC="clang-${LLVM_VERSION}"
export CXX="g++-6"
export CC="gcc-6"
export PATH=${HOME}/osgeo4travis/bin:${PATH} export PATH=${HOME}/osgeo4travis/bin:${PATH}
export PYTHONPATH=${HOME}/osgeo4travis/lib/python3.3/site-packages/ export PYTHONPATH=${HOME}/osgeo4travis/lib/python3.3/site-packages/


cmake --version cmake --version
${CC} --version ${CC} --version
${CXX} --version ${CXX} --version


CLANG_WARNINGS="-Wimplicit-fallthrough" # CLANG_WARNINGS="-Wimplicit-fallthrough"
CLANG_WARNINGS=""


# Include this line for debug reasons # Include this line for debug reasons
# -DCMAKE_BUILD_TYPE=RelWithDebInfo \ # -DCMAKE_BUILD_TYPE=RelWithDebInfo \
Expand Down

0 comments on commit c8011d9

Please sign in to comment.