From d15fcb3776e27c3100396306ee7d58c6acbf0466 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjell=20Hedstr=C3=B6m?= Date: Sun, 4 Dec 2016 07:17:21 -0700 Subject: [PATCH 1/9] Update .travis.yml Dummy trigger to travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5476be0..40097ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ before_install: fi install: - # gcc 5 + # gcc 5 . - if [ "$CXX" == "g++" ]; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 10; fi - if [ "$CXX" == "g++" ]; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 10; fi From 0624e8c655f91c3f23b81967ea010246edd95012 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjell=20Hedstr=C3=B6m?= Date: Sun, 4 Dec 2016 08:32:45 -0700 Subject: [PATCH 2/9] Update .travis.yml Ref: discussion at https://github.com/travis-ci/travis-ci/issues/4631 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 40097ea..aa8e174 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,10 +26,10 @@ before_install: sudo apt-get update; sudo apt-get install gcc-5 g++-5; sudo apt-get install software-properties-common; - sudo add-apt-repository -y ppa:george-edison55/cmake-3.x; + sudo add-apt-repository -y ppa:george-edison55-precise-backports; sudo apt-get update; sudo apt-get update -qq; - sudo apt-get install cmake; + sudo apt-get install cmake cmake-data; fi install: From 296b91d8570685d18ab5e89dddcb65445017a661 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjell=20Hedstr=C3=B6m?= Date: Mon, 5 Dec 2016 23:10:28 -0700 Subject: [PATCH 3/9] test2 --- .travis.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index aa8e174..9eaa8d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,14 @@ branches: only: - master - +addons: + apt: + sources: + - george-edison55-precise-backports # cmake 3.2.3 / doxygen 1.8.3 + packages: + - cmake + - cmake-data + before_install: # use http://lint.travis-ci.org/ to validate changes # sudo add-apt-repository -y ppa:h-rayflood/llvm; @@ -26,10 +33,10 @@ before_install: sudo apt-get update; sudo apt-get install gcc-5 g++-5; sudo apt-get install software-properties-common; - sudo add-apt-repository -y ppa:george-edison55-precise-backports; + # sudo add-apt-repository -y ppa:george-edison55-precise-backports; sudo apt-get update; sudo apt-get update -qq; - sudo apt-get install cmake cmake-data; + #sudo apt-get install cmake cmake-data; fi install: From aed15716ad40d2f04e06e17bd7cef730c6a23594 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjell=20Hedstr=C3=B6m?= Date: Mon, 5 Dec 2016 23:16:48 -0700 Subject: [PATCH 4/9] test3 --- .travis.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9eaa8d9..55a8a78 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,13 +12,7 @@ branches: only: - master -addons: - apt: - sources: - - george-edison55-precise-backports # cmake 3.2.3 / doxygen 1.8.3 - packages: - - cmake - - cmake-data + before_install: # use http://lint.travis-ci.org/ to validate changes @@ -65,3 +59,11 @@ install: script: "./scripts/buildAndRunTests.sh" +addons: + apt: + packages: + - cmake + - cmake-data + sources: + - kalakris-cmake + - george-edison55-precise-backports From 10150e7633dc2abcf688891265fb9c8888fd2666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjell=20Hedstr=C3=B6m?= Date: Mon, 5 Dec 2016 23:23:16 -0700 Subject: [PATCH 5/9] key-space issues, fixed1 --- .travis.yml | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 55a8a78..7ef4a3f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: cpp +sudo: false os: - linux @@ -21,26 +22,26 @@ before_install: if [ ${TRAVIS_OS_NAME} = 'linux' ]; then - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; - sudo apt-get update -qq; - sudo apt-get install python-software-properties; - sudo apt-get update; - sudo apt-get install gcc-5 g++-5; - sudo apt-get install software-properties-common; + add-apt-repository -y ppa:ubuntu-toolchain-r/test; + apt-get update -qq; + apt-get install python-software-properties; + apt-get update; + apt-get install gcc-5 g++-5; + apt-get install software-properties-common; # sudo add-apt-repository -y ppa:george-edison55-precise-backports; - sudo apt-get update; - sudo apt-get update -qq; + apt-get update; + apt-get update -qq; #sudo apt-get install cmake cmake-data; fi install: # gcc 5 . - - if [ "$CXX" == "g++" ]; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 10; fi - - if [ "$CXX" == "g++" ]; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 10; fi + - if [ "$CXX" == "g++" ]; then update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 10; fi + - if [ "$CXX" == "g++" ]; then update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 10; fi # clang 3.4 - - if [ "$CXX" == "clang++" ]; then sudo apt-get install --allow-unauthenticated -qq clang-3.4; fi - - if [ "$CXX" == "clang++" ]; then sudo apt-get install libc++1 libc++abi-dev || true; fi + - if [ "$CXX" == "clang++" ]; then apt-get install --allow-unauthenticated -qq clang-3.4; fi + - if [ "$CXX" == "clang++" ]; then apt-get install libc++1 libc++abi-dev || true; fi - if [ "$CXX" == "clang++" ]; then export CXXFLAGS="-std=c++0x -stdlib=libc++"; fi - if [ "$CXX" == "clang++" ]; then svn co --quiet http://llvm.org/svn/llvm-project/libcxx/trunk libcxx; fi @@ -61,9 +62,10 @@ script: "./scripts/buildAndRunTests.sh" addons: apt: - packages: - - cmake - - cmake-data sources: - kalakris-cmake - george-edison55-precise-backports + packages: + - cmake + - cmake-data + From c70fd4f978d3aa862c93be1e0ff96bc2ff4f2123 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjell=20Hedstr=C3=B6m?= Date: Mon, 5 Dec 2016 23:26:14 -0700 Subject: [PATCH 6/9] space removed --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7ef4a3f..3bc6593 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,6 @@ branches: - master - before_install: # use http://lint.travis-ci.org/ to validate changes # sudo add-apt-repository -y ppa:h-rayflood/llvm; @@ -59,7 +58,7 @@ install: - echo $PWD script: "./scripts/buildAndRunTests.sh" - + addons: apt: sources: From fc1f531d1d078572278232e821b1875a1bb0b5b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjell=20Hedstr=C3=B6m?= Date: Mon, 5 Dec 2016 23:29:43 -0700 Subject: [PATCH 7/9] sudo change reverted --- .travis.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3bc6593..958713c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: cpp -sudo: false os: - linux @@ -21,15 +20,15 @@ before_install: if [ ${TRAVIS_OS_NAME} = 'linux' ]; then - add-apt-repository -y ppa:ubuntu-toolchain-r/test; - apt-get update -qq; - apt-get install python-software-properties; - apt-get update; - apt-get install gcc-5 g++-5; - apt-get install software-properties-common; + sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; + sudo apt-get update -qq; + sudo apt-get install python-software-properties; + sudo apt-get update; + sudo apt-get install gcc-5 g++-5; + sudo apt-get install software-properties-common; # sudo add-apt-repository -y ppa:george-edison55-precise-backports; - apt-get update; - apt-get update -qq; + sudo apt-get update; + sudo apt-get update -qq; #sudo apt-get install cmake cmake-data; fi From 8cc59bece270d731c4e41c3f9ed48fe3b1132574 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjell=20Hedstr=C3=B6m?= Date: Mon, 5 Dec 2016 23:31:46 -0700 Subject: [PATCH 8/9] more sudo --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 958713c..c0bdfa4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,20 +26,20 @@ before_install: sudo apt-get update; sudo apt-get install gcc-5 g++-5; sudo apt-get install software-properties-common; - # sudo add-apt-repository -y ppa:george-edison55-precise-backports; + # sudo add-apt-repository -y ppa:george-edison55-precise-backports; sudo apt-get update; sudo apt-get update -qq; - #sudo apt-get install cmake cmake-data; + # sudo apt-get install cmake cmake-data; fi install: # gcc 5 . - - if [ "$CXX" == "g++" ]; then update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 10; fi - - if [ "$CXX" == "g++" ]; then update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 10; fi + - if [ "$CXX" == "g++" ]; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 10; fi + - if [ "$CXX" == "g++" ]; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 10; fi # clang 3.4 - - if [ "$CXX" == "clang++" ]; then apt-get install --allow-unauthenticated -qq clang-3.4; fi - - if [ "$CXX" == "clang++" ]; then apt-get install libc++1 libc++abi-dev || true; fi + - if [ "$CXX" == "clang++" ]; then sudo apt-get install --allow-unauthenticated -qq clang-3.4; fi + - if [ "$CXX" == "clang++" ]; then sudo apt-get install libc++1 libc++abi-dev || true; fi - if [ "$CXX" == "clang++" ]; then export CXXFLAGS="-std=c++0x -stdlib=libc++"; fi - if [ "$CXX" == "clang++" ]; then svn co --quiet http://llvm.org/svn/llvm-project/libcxx/trunk libcxx; fi From 1a27d6379faff0248c9f055bcc102064b957258a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjell=20Hedstr=C3=B6m?= Date: Mon, 5 Dec 2016 23:49:32 -0700 Subject: [PATCH 9/9] thanks to: https://github.com/PacificBiosciences/pbbam/blob/master/.travis.yml --- .travis.yml | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index c0bdfa4..9a44b1d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,8 @@ language: cpp os: - linux +dist: trusty + compiler: - gcc #- clang @@ -14,26 +16,30 @@ branches: before_install: - # use http://lint.travis-ci.org/ to validate changes - # sudo add-apt-repository -y ppa:h-rayflood/llvm; - # sudo apt-get install --allow-unauthenticated -qq clang-3.4 if [ ${TRAVIS_OS_NAME} = 'linux' ]; then + + sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; + + sudo add-apt-repository -y ppa:george-edison55/precise-backports; + + sudo apt-get remove -qq cmake cmake-data + sudo apt-get autoremove -qq + sudo apt-get update -qq; sudo apt-get install python-software-properties; sudo apt-get update; sudo apt-get install gcc-5 g++-5; - sudo apt-get install software-properties-common; - # sudo add-apt-repository -y ppa:george-edison55-precise-backports; + sudo apt-get install software-properties-common; sudo apt-get update; sudo apt-get update -qq; - # sudo apt-get install cmake cmake-data; + sudo apt-get install cmake cmake-data; fi install: - # gcc 5 . + # gcc 5 - if [ "$CXX" == "g++" ]; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 10; fi - if [ "$CXX" == "g++" ]; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 10; fi @@ -58,12 +64,5 @@ install: script: "./scripts/buildAndRunTests.sh" -addons: - apt: - sources: - - kalakris-cmake - - george-edison55-precise-backports - packages: - - cmake - - cmake-data +