Skip to content
This repository has been archived by the owner on Jul 17, 2023. It is now read-only.

Commit

Permalink
update .travis.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
x-chen committed Sep 26, 2017
1 parent 84dba94 commit fc54af5
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 21 deletions.
37 changes: 17 additions & 20 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@

#
# Using sudo-false/container-based tests for greater (linux) test responsiveness. This doesn't seem
# to effect the queing time for OSX tests.
#

dist: trusty
sudo: false

language: cpp
Expand All @@ -6,34 +13,24 @@ matrix:
include:
- os: linux
compiler: gcc
addons:
apt:
sources:
- ubuntu-toolchain-r-test # for gcc 4.8
packages:
- gcc-4.8
- g++-4.8
before_install:
- export CC=gcc-4.8 CXX=g++-4.8
install:
# install cppcheck from source:
- wget https://sourceforge.net/projects/cppcheck/files/cppcheck/1.69/cppcheck-1.69.tar.bz2 &&
tar -xjf cppcheck-1.69.tar.bz2 &&
cd cppcheck-1.69 &&
# Install cppcheck from source:
- CPPCHECK_VERSION=1.79 &&
wget https://sourceforge.net/projects/cppcheck/files/cppcheck/${CPPCHECK_VERSION}/cppcheck-${CPPCHECK_VERSION}.tar.bz2 &&
tar -xjf cppcheck-${CPPCHECK_VERSION}.tar.bz2 &&
cd cppcheck-${CPPCHECK_VERSION} &&
make -j4 &&
export PATH=$PATH:$PWD/ &&
cd ..
- os: linux
compiler: clang
addons:
apt:
packages:
- llvm-3.4
- llvm-3.4-dev

# Note osx_image request corresponds to travis default as of Aug 2017 (OSX 10.11.6 with Xcode 7.3.1)
#
# Running gcc would just repeat the clang test on OSX (unless we do some extra work...), so skip it
- os: osx
compiler: clang
osx_image: xcode61
# gcc would just repeat the clang test on OSX (unless we do some extra work...), so skip it
osx_image: xcode7.3

script:
- mkdir build &&
Expand Down
1 change: 1 addition & 0 deletions src/c++/lib/htsapi/bam_util.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include "bam_util.hh"
#include "blt_util/log.hh"

#include <iostream>
#include <cassert>


Expand Down
2 changes: 1 addition & 1 deletion src/cmake/cxxConfigure.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
elseif (${IS_CLANGXX})

# Set this TRUE to uncover new clang warnings (typically this is done to test a new clang release):
set (IS_WARN_EVERYTHING TRUE)
set (IS_WARN_EVERYTHING FALSE)

set (CXX_WARN_LIST "") # all clang-specific enabled warnings
set (CXX_NOWARN_LIST "") # all clang-specific warnings disabled only when "-Weverything" is defined
Expand Down

0 comments on commit fc54af5

Please sign in to comment.