sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[circleci] use clang-3.7

Browse source
This commit is contained in:
Dane Springmeyer 2016-03-14 10:21:35 -07:00
parent b70fed842e
commit 75b57ab960
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
circle.yml
View file

@ -7,6 +7,7 @@ machine:
JOBS: 8 JOBS: 8
CCACHE_TEMPDIR: /tmp/.ccache-temp CCACHE_TEMPDIR: /tmp/.ccache-temp
CCACHE_COMPRESS: 1 CCACHE_COMPRESS: 1
LLVM_VERSION: 3.7
pre: pre:
- echo "here" - echo "here"
post: post:
@ -17,14 +18,14 @@ dependencies:
- "~/.ccache" - "~/.ccache"
pre: pre:
- sudo wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add - - sudo wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -
- sudo add-apt-repository -y "deb http://llvm.org/apt/precise/ llvm-toolchain-precise-3.8 main" - sudo add-apt-repository -y "deb http://llvm.org/apt/precise/ llvm-toolchain-precise-${LLVM_VERSION} main"
- sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
- sudo apt-get update -y - sudo apt-get update -y
override: override:
- sudo apt-get install clang-3.8 -y - sudo apt-get install clang-${LLVM_VERSION} -y
post: post:
- which clang-3.8 - which clang-${LLVM_VERSION}
- which clang++-3.8 - which clang++-${LLVM_VERSION}
test: test:

2
scripts/circleci.sh
View file

@ -7,6 +7,6 @@ source bootstrap.sh
ccache --version ccache --version
ccache -p || true ccache -p || true
ccache --show-stats || true ccache --show-stats || true
./configure CC="clang-3.8" CXX="ccache clang++-3.8 -Qunused-arguments" ./configure CC="clang-${LLVM_VERSION}" CXX="ccache clang++-${LLVM_VERSION} -Qunused-arguments"
make make
make test make test