Skip to content

Resync 0.10 into master #1099

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 9, 2016
Merged

Resync 0.10 into master #1099

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
200d12e
Revert "Fix the Travis clang build"
peternewman Jul 9, 2016
6df9743
Revert "Revert to Ubuntu clang as llvm nightly repo has gone AWOL"
peternewman Jul 9, 2016
350f0a0
Merge pull request #1098 from peternewman/0.10-clang-latest
nomis52 Jul 9, 2016
22a9811
Merge pull request #11 from OpenLightingProject/0.10
peternewman Jul 9, 2016
38e73aa
Merge branch 'master' into master-resync
peternewman Jul 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ addons:
- g++-6
packages: &core_build_clang_latest
- *core_build
- clang-3.4
- clang-3.9

matrix:
fast_finish: true
Expand All @@ -56,7 +56,7 @@ matrix:
- *core_build_clang_latest
sources:
- ubuntu-toolchain-r-test
# - llvm-toolchain-precise
- llvm-toolchain-precise
- os: linux
dist: trusty
compiler: gcc
Expand Down Expand Up @@ -202,7 +202,7 @@ before_install:
- if [ "$TRAVIS_OS_NAME" == "linux" -a \( "$TASK" = "compile" -o "$TASK" = "coverage" -o "$TASK" = "doxygen" \) -a "$CXX" = "g++" ]; then export CXX="ccache g++-6" CC="ccache gcc-6"; fi
- if [ "$TASK" = "coverity" -a "$CXX" = "g++" ]; then export CXX="ccache g++-4.9" CC="ccache gcc-4.9"; fi
#Use the latest clang if we're compiling with clang
# - if [ "$TRAVIS_OS_NAME" == "linux" -a "$CXX" = "clang++" ]; then export CXX="clang++-3.4" CC="clang-3.4"; fi
- if [ "$TRAVIS_OS_NAME" == "linux" -a "$CXX" = "clang++" ]; then export CXX="clang++-3.9" CC="clang-3.9"; fi
#Report the compiler version
- $CXX --version

Expand Down