From 43ab47d9274b31f7028f81fac09c015547fb3f4b Mon Sep 17 00:00:00 2001 From: Phuntsok Drak-pa Date: Thu, 3 May 2018 11:28:38 +0200 Subject: [PATCH 01/17] testing travis-ci #1 --- .travis.yml | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 32cafe0..c2730d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,20 +1,28 @@ -sudo: false language: cpp -compiler: clang -os: linux +compiler: gcc dist: trusty matrix: - include: - - script: - - cd build - - cmake -DCMAKE_BUILD_TYPE=Debug .. - - make -j - - script: - - cd build - - cmake -DCMAKE_BUILD_TYPE=Release .. - - make -j + include: + - env: + - BUILD=Debug + - BINDIR=debug + - env: + - BUILD=Release + - BINDIR=bin -notifications: - email: - - phundrak@phundrak.fr +before_install: + #C++17 + - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test + - sudo apt-get update -qq + +install: + #C++17 + - sudo apt-get install -qq g++-6 + - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-6 90 + +script: + - cd build + - cmake -DCMAKE_BUILD_TYPE=$BUILD .. + - make -j + - ../$BINDIR/projet_lzw -c -i ../$BINDIR/projet_lzw From 877a1d1ebd8f44791c720f7056663f809d171a9c Mon Sep 17 00:00:00 2001 From: Phuntsok Drak-pa Date: Thu, 3 May 2018 11:42:10 +0200 Subject: [PATCH 02/17] testing travis-ci #2 --- .travis.yml | 64 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 47 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index c2730d6..d2da544 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,25 +1,55 @@ language: cpp -compiler: gcc -dist: trusty matrix: include: - - env: - - BUILD=Debug - - BINDIR=debug - - env: - - BUILD=Release + - os: linux + dist: trusty + compiler: clang + env: + - CC=clang + - CXX=clang++ + - BUILDTYPE=Release - BINDIR=bin - -before_install: - #C++17 - - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - - sudo apt-get update -qq - -install: - #C++17 - - sudo apt-get install -qq g++-6 - - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-6 90 + - os: linux + dist: trusty + compiler: clang + env: + - CC=clang + - CXX=clang++ + - BUILDTYPE=Debug + - BINDIR=debug + - os: linux + dist: trusty + compiler: gcc + addons: &gcc7 + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - cmake3 + - g++7 + - gcc7 + env: + - CC=gcc7 + - CXX=g++7 + - BUILDTYPE=Release + - BINDIR=bin + - os: linux + dist: trusty + compiler: gcc + addons: &gcc7 + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - cmake3 + - g++7 + - gcc7 + env: + - CC=gcc7 + - CXX=g++7 + - BUILDTYPE=Debug + - BINDIR=debug script: - cd build From 0a2ea8d706c5c91e8e94d4d76e7935d6cddd22cb Mon Sep 17 00:00:00 2001 From: Phuntsok Drak-pa Date: Thu, 3 May 2018 11:55:53 +0200 Subject: [PATCH 03/17] testing travis-ci #3 --- .travis.yml | 81 ++++++++++++++++++----------------------------------- 1 file changed, 28 insertions(+), 53 deletions(-) diff --git a/.travis.yml b/.travis.yml index d2da544..4df9a22 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,58 +1,33 @@ language: cpp +os: linux +dist: trusty matrix: - include: - - os: linux - dist: trusty - compiler: clang - env: - - CC=clang - - CXX=clang++ - - BUILDTYPE=Release - - BINDIR=bin - - os: linux - dist: trusty - compiler: clang - env: - - CC=clang - - CXX=clang++ - - BUILDTYPE=Debug - - BINDIR=debug - - os: linux - dist: trusty - compiler: gcc - addons: &gcc7 - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - cmake3 - - g++7 - - gcc7 - env: - - CC=gcc7 - - CXX=g++7 - - BUILDTYPE=Release - - BINDIR=bin - - os: linux - dist: trusty - compiler: gcc - addons: &gcc7 - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - cmake3 - - g++7 - - gcc7 - env: - - CC=gcc7 - - CXX=g++7 - - BUILDTYPE=Debug - - BINDIR=debug + include: + - env: + - CC=clang-5.0 + CXX=clang++-5.0 + BUILD_TYPE=Release + BIN_DIR=bin + addons: &clang40 + apt: + packages: + - g++-5 + - clang-5.0 + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-trusty-5.0 + - sourceline: 'deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-4.0 main' + key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key' + - env: + - CC=clang-5.0 + - CXX=clang++-5.0 + - BUILD_TYPE=Release + - BIN_DIR=bin + addons: *clang40 script: - - cd build - - cmake -DCMAKE_BUILD_TYPE=$BUILD .. - - make -j - - ../$BINDIR/projet_lzw -c -i ../$BINDIR/projet_lzw + - cd build + - cmake -DCMAKE_BUILD_TYPE=$BUILD .. + - make -j + - ../$BINDIR/projet_lzw -c -i ../$BINDIR/projet_lzw From c332361b0d87753a92d390c256e4e9fd27662d41 Mon Sep 17 00:00:00 2001 From: Phuntsok Drak-pa Date: Thu, 3 May 2018 11:57:12 +0200 Subject: [PATCH 04/17] testing travis-ci #4 --- .travis.yml | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4df9a22..824e6e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,26 +5,26 @@ dist: trusty matrix: include: - env: - - CC=clang-5.0 - CXX=clang++-5.0 - BUILD_TYPE=Release - BIN_DIR=bin - addons: &clang40 - apt: - packages: - - g++-5 - - clang-5.0 - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-trusty-5.0 - - sourceline: 'deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-4.0 main' - key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key' + - CC=clang-5.0 + CXX=clang++-5.0 + BUILD_TYPE=Release + BIN_DIR=bin + addons: &clang40 + apt: + packages: + - g++-5 + - clang-5.0 + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-trusty-5.0 + - sourceline: 'deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-4.0 main' + key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key' - env: - - CC=clang-5.0 - - CXX=clang++-5.0 - - BUILD_TYPE=Release - - BIN_DIR=bin - addons: *clang40 + - CC=clang-5.0 + - CXX=clang++-5.0 + - BUILD_TYPE=Release + - BIN_DIR=bin + addons: *clang40 script: - cd build From a23a42e86ddd75760d33e268ac6ce7f98a63cb99 Mon Sep 17 00:00:00 2001 From: Phuntsok Drak-pa Date: Thu, 3 May 2018 11:59:17 +0200 Subject: [PATCH 05/17] testing travis-ci #5 --- .travis.yml | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/.travis.yml b/.travis.yml index 824e6e1..ac1e207 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,31 +3,31 @@ os: linux dist: trusty matrix: - include: - - env: - - CC=clang-5.0 - CXX=clang++-5.0 - BUILD_TYPE=Release - BIN_DIR=bin - addons: &clang40 - apt: - packages: - - g++-5 - - clang-5.0 - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-trusty-5.0 - - sourceline: 'deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-4.0 main' - key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key' - - env: - - CC=clang-5.0 - - CXX=clang++-5.0 - - BUILD_TYPE=Release - - BIN_DIR=bin - addons: *clang40 + include: + - env: + - CC=clang-5.0 + CXX=clang++-5.0 + BUILD_TYPE=Release + BIN_DIR=bin + addons: &clang40 + apt: + packages: + - g++-5 + - clang-5.0 + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-trusty-5.0 + - sourceline: 'deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-4.0 main' + key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key' + - env: + - CC=clang-5.0 + - CXX=clang++-5.0 + - BUILD_TYPE=Release + - BIN_DIR=bin + addons: *clang40 script: - - cd build - - cmake -DCMAKE_BUILD_TYPE=$BUILD .. - - make -j - - ../$BINDIR/projet_lzw -c -i ../$BINDIR/projet_lzw + - cd build + - cmake -DCMAKE_BUILD_TYPE=$BUILD .. + - make -j + - ../$BINDIR/projet_lzw -c -i ../$BINDIR/projet_lzw From 973c5897e5d17e0dab639cc4d02367777973aa1b Mon Sep 17 00:00:00 2001 From: Phuntsok Drak-pa Date: Thu, 3 May 2018 12:04:43 +0200 Subject: [PATCH 06/17] testing travis-ci #6 --- .travis.yml | 41 ++++++++++++++--------------------------- CMakeLists.txt | 24 ++++++++++++------------ 2 files changed, 26 insertions(+), 39 deletions(-) diff --git a/.travis.yml b/.travis.yml index ac1e207..32cafe0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,33 +1,20 @@ +sudo: false language: cpp +compiler: clang os: linux dist: trusty matrix: - include: - - env: - - CC=clang-5.0 - CXX=clang++-5.0 - BUILD_TYPE=Release - BIN_DIR=bin - addons: &clang40 - apt: - packages: - - g++-5 - - clang-5.0 - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-trusty-5.0 - - sourceline: 'deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-4.0 main' - key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key' - - env: - - CC=clang-5.0 - - CXX=clang++-5.0 - - BUILD_TYPE=Release - - BIN_DIR=bin - addons: *clang40 + include: + - script: + - cd build + - cmake -DCMAKE_BUILD_TYPE=Debug .. + - make -j + - script: + - cd build + - cmake -DCMAKE_BUILD_TYPE=Release .. + - make -j -script: - - cd build - - cmake -DCMAKE_BUILD_TYPE=$BUILD .. - - make -j - - ../$BINDIR/projet_lzw -c -i ../$BINDIR/projet_lzw +notifications: + email: + - phundrak@phundrak.fr diff --git a/CMakeLists.txt b/CMakeLists.txt index 9cfe5ab..ca48bf9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,24 +8,24 @@ set(TGT "projet_lzw") set(${TGT}_VERSION_MAJOR 0) set(${TGT}_VERSION_MINOR 1) -set(CXX_COVERAGE_COMPILE_FLAGS "-pedantic -Wall -Wextra -Wold-style-cast -Woverloaded-virtual -Wfloat-equal -Wwrite-strings -Wpointer-arith -Wcast-qual -Wcast-align -Wconversion -Wsign-conversion -Wshadow -Weffc++ -Wredundant-decls -Wdouble-promotion -Winit-self -Wswitch-default -Wswitch-enum -Wundef -Winline -Wunused -Wnon-virtual-dtor -pthread") +set(CXX_COVERAGE_COMPILE_FLAGS "-std=c++1z -pedantic -Wall -Wextra -Wold-style-cast -Woverloaded-virtual -Wfloat-equal -Wwrite-strings -Wpointer-arith -Wcast-qual -Wcast-align -Wconversion -Wsign-conversion -Wshadow -Weffc++ -Wredundant-decls -Wdouble-promotion -Winit-self -Wswitch-default -Wswitch-enum -Wundef -Winline -Wunused -Wnon-virtual-dtor -pthread") set(CMAKE_CXX_FLAGS_DEBUG "${CXX_COVERAGE_COMPILE_FLAGS} -DDebug -g -pg") set(CMAKE_CXX_FLAGS_RELEASE "${CXX_COVERAGE_COMPILE_FLAGS} -O3") include(CheckCXXCompilerFlag) # Check for standard to use -check_cxx_compiler_flag(-std=c++17 HAVE_FLAG_STD_CXX17) -if(HAVE_FLAG_STD_CXX17) - set(CMAKE_CXX_STANDARD 17) -else() - check_cxx_compiler_flag(-std=c++1z HAVE_FLAG_STD_CXX1Z) - if(HAVE_FLAG_STD_CXX1Z) - set(CXX_COVERAGE_COMPILE_FLAGS "${CXX_COVERAGE_COMPILE_FLAGS} -std=c++1z") - else() - message( FATAL_ERROR "C++17 not supported, CMake will exit." ) - endif() -endif() +#check_cxx_compiler_flag(-std=c++17 HAVE_FLAG_STD_CXX17) +#if(HAVE_FLAG_STD_CXX17) +# set(CMAKE_CXX_STANDARD 17) +#else() +# check_cxx_compiler_flag(-std=c++1z HAVE_FLAG_STD_CXX1Z) +# if(HAVE_FLAG_STD_CXX1Z) +# set(CXX_COVERAGE_COMPILE_FLAGS "${CXX_COVERAGE_COMPILE_FLAGS} -std=c++1z") +# else() +# message( FATAL_ERROR "C++17 not supported, CMake will exit." ) +# endif() +#endif() # set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED YES) From 4a6bd0f9fb064a8ab68b4045295697128bd725f3 Mon Sep 17 00:00:00 2001 From: Phuntsok Drak-pa Date: Thu, 3 May 2018 12:12:15 +0200 Subject: [PATCH 07/17] testing travis-ci #7 --- .travis.yml | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 32cafe0..afc3f1e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,18 +3,29 @@ language: cpp compiler: clang os: linux dist: trusty +addons: + apt: + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-trusty-5.0 + packages: + - g++-6 + - clang-5.0 matrix: include: - - script: - - cd build - - cmake -DCMAKE_BUILD_TYPE=Debug .. - - make -j - - script: - - cd build - - cmake -DCMAKE_BUILD_TYPE=Release .. - - make -j - -notifications: - email: - - phundrak@phundrak.fr + - env: + BUILD_TYPE=Debug + BIN_DIR=debug + CC=clang-5.0 + CXX=clang++-5.0 + - env: + BUILD_TYPE=Release + BIN_DIR=bin + CC=clang-5.0 + CXX=clang++-5.0 +script: + - cd build + - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. + - make -j + - ../$BIN_DIR/projet_lzw -c -i ../$BIN_DIR/projet_lzw From 8bb992acc11fae78cd87c080a242e3e5d1174b43 Mon Sep 17 00:00:00 2001 From: Phuntsok Drak-pa Date: Thu, 3 May 2018 12:20:17 +0200 Subject: [PATCH 08/17] testing travis-ci #8 --- .travis.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.travis.yml b/.travis.yml index afc3f1e..e687e0d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ addons: matrix: include: + # Linux Clang C++17 - env: BUILD_TYPE=Debug BIN_DIR=debug @@ -24,6 +25,28 @@ matrix: BIN_DIR=bin CC=clang-5.0 CXX=clang++-5.0 + + # Linux GCC C++17 + - env: + BUILD_TYPE=Debug + BIN_DIR=debug + compiler: gcc + before_install: + - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test + - sudo apt-get update -qq + install: + - sudo apt-get install -qq g++-6 + - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-6 90 + - env: + BUILD_TYPE=Release + BIN_DIR=bin + compiler: gcc + before_install: + - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test + - sudo apt-get update -qq + install: + - sudo apt-get install -qq g++-6 + - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-6 90 script: - cd build - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. From 589e1961d8666f677efb5c0f96fc48f2e61da367 Mon Sep 17 00:00:00 2001 From: Phuntsok Drak-pa Date: Thu, 3 May 2018 12:29:37 +0200 Subject: [PATCH 09/17] testing travis-ci #9 --- .travis.yml | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index e687e0d..3f34f72 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ addons: - ubuntu-toolchain-r-test - llvm-toolchain-trusty-5.0 packages: - - g++-6 + - g++-7 - clang-5.0 matrix: @@ -30,23 +30,15 @@ matrix: - env: BUILD_TYPE=Debug BIN_DIR=debug + CC=gcc-7 + CXX=g++-7 compiler: gcc - before_install: - - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - - sudo apt-get update -qq - install: - - sudo apt-get install -qq g++-6 - - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-6 90 - env: BUILD_TYPE=Release BIN_DIR=bin + CC=gcc-7 + CXX=g++-7 compiler: gcc - before_install: - - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - - sudo apt-get update -qq - install: - - sudo apt-get install -qq g++-6 - - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-6 90 script: - cd build - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. From e647985bd75bf3ce17b639b5fcad336e178df644 Mon Sep 17 00:00:00 2001 From: Phuntsok Drak-pa Date: Thu, 3 May 2018 12:33:23 +0200 Subject: [PATCH 10/17] CMakeList updated --- CMakeLists.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ca48bf9..9cfe5ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,24 +8,24 @@ set(TGT "projet_lzw") set(${TGT}_VERSION_MAJOR 0) set(${TGT}_VERSION_MINOR 1) -set(CXX_COVERAGE_COMPILE_FLAGS "-std=c++1z -pedantic -Wall -Wextra -Wold-style-cast -Woverloaded-virtual -Wfloat-equal -Wwrite-strings -Wpointer-arith -Wcast-qual -Wcast-align -Wconversion -Wsign-conversion -Wshadow -Weffc++ -Wredundant-decls -Wdouble-promotion -Winit-self -Wswitch-default -Wswitch-enum -Wundef -Winline -Wunused -Wnon-virtual-dtor -pthread") +set(CXX_COVERAGE_COMPILE_FLAGS "-pedantic -Wall -Wextra -Wold-style-cast -Woverloaded-virtual -Wfloat-equal -Wwrite-strings -Wpointer-arith -Wcast-qual -Wcast-align -Wconversion -Wsign-conversion -Wshadow -Weffc++ -Wredundant-decls -Wdouble-promotion -Winit-self -Wswitch-default -Wswitch-enum -Wundef -Winline -Wunused -Wnon-virtual-dtor -pthread") set(CMAKE_CXX_FLAGS_DEBUG "${CXX_COVERAGE_COMPILE_FLAGS} -DDebug -g -pg") set(CMAKE_CXX_FLAGS_RELEASE "${CXX_COVERAGE_COMPILE_FLAGS} -O3") include(CheckCXXCompilerFlag) # Check for standard to use -#check_cxx_compiler_flag(-std=c++17 HAVE_FLAG_STD_CXX17) -#if(HAVE_FLAG_STD_CXX17) -# set(CMAKE_CXX_STANDARD 17) -#else() -# check_cxx_compiler_flag(-std=c++1z HAVE_FLAG_STD_CXX1Z) -# if(HAVE_FLAG_STD_CXX1Z) -# set(CXX_COVERAGE_COMPILE_FLAGS "${CXX_COVERAGE_COMPILE_FLAGS} -std=c++1z") -# else() -# message( FATAL_ERROR "C++17 not supported, CMake will exit." ) -# endif() -#endif() +check_cxx_compiler_flag(-std=c++17 HAVE_FLAG_STD_CXX17) +if(HAVE_FLAG_STD_CXX17) + set(CMAKE_CXX_STANDARD 17) +else() + check_cxx_compiler_flag(-std=c++1z HAVE_FLAG_STD_CXX1Z) + if(HAVE_FLAG_STD_CXX1Z) + set(CXX_COVERAGE_COMPILE_FLAGS "${CXX_COVERAGE_COMPILE_FLAGS} -std=c++1z") + else() + message( FATAL_ERROR "C++17 not supported, CMake will exit." ) + endif() +endif() # set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED YES) From e5ee197ae7af7ca8a7df9c295fce9f3e07c5c908 Mon Sep 17 00:00:00 2001 From: Phuntsok Drak-pa Date: Thu, 3 May 2018 12:40:56 +0200 Subject: [PATCH 11/17] testing travis-ci #10 --- .travis.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3f34f72..4dcd018 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,17 +28,15 @@ matrix: # Linux GCC C++17 - env: - BUILD_TYPE=Debug - BIN_DIR=debug - CC=gcc-7 - CXX=g++-7 + - MATRIX_EVAL="BUILD_TYPE=Debug && BIN_DIR=debug && CC=gcc-7 && CXX=g++-7" compiler: gcc + before_install: + - eval "${MATRIX_EVAL}" - env: - BUILD_TYPE=Release - BIN_DIR=bin - CC=gcc-7 - CXX=g++-7 + - MATRIX_EVAL="BUILD_TYPE=Release && BIN_DIR=bin && CC=gcc-7 && CXX=g++-7" compiler: gcc + before_install: + - eval "${MATRIX_EVAL}" script: - cd build - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. From 2ff37a5670a9df18d47da0339ef5753e6a4eabf0 Mon Sep 17 00:00:00 2001 From: Phuntsok Drak-pa Date: Thu, 3 May 2018 12:48:18 +0200 Subject: [PATCH 12/17] testing travis-ci #11 --- .travis.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.travis.yml b/.travis.yml index 4dcd018..c0f2280 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,6 +37,18 @@ matrix: compiler: gcc before_install: - eval "${MATRIX_EVAL}" + + # OSX Clang + - os: osx + osx_image: xcode8 + env: + BUILD_TYPE=Release + BIN_DIR=bin + - os: osx + osx_image: xcode8 + env: + BUILD_TYPE=Debug + BIN_DIR=debug script: - cd build - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. From ff2c893439d0846db5cfcbecdfa728233d88d95a Mon Sep 17 00:00:00 2001 From: Phuntsok Drak-pa Date: Thu, 3 May 2018 12:51:28 +0200 Subject: [PATCH 13/17] testing travis-ci #12 --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index c0f2280..acac01e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,11 +44,15 @@ matrix: env: BUILD_TYPE=Release BIN_DIR=bin + install: + brew install cmake - os: osx osx_image: xcode8 env: BUILD_TYPE=Debug BIN_DIR=debug + install: + brew install cmake script: - cd build - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. From fc6c6aa9f2cc5ff8e07fec6198aab6816a433459 Mon Sep 17 00:00:00 2001 From: Phuntsok Drak-pa Date: Thu, 3 May 2018 12:56:59 +0200 Subject: [PATCH 14/17] testing travis-ci #13 --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index acac01e..aa60d3a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,6 +41,7 @@ matrix: # OSX Clang - os: osx osx_image: xcode8 + ruby: 2.3 env: BUILD_TYPE=Release BIN_DIR=bin @@ -48,6 +49,7 @@ matrix: brew install cmake - os: osx osx_image: xcode8 + ruby: 2.3 env: BUILD_TYPE=Debug BIN_DIR=debug From 5e6f43dcaa73fe3909a6e46a6124576c000f2306 Mon Sep 17 00:00:00 2001 From: Phuntsok Drak-pa Date: Thu, 3 May 2018 13:03:09 +0200 Subject: [PATCH 15/17] testing travis-ci #14 --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index aa60d3a..84c270a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,6 +45,8 @@ matrix: env: BUILD_TYPE=Release BIN_DIR=bin + before_install: + brew update install: brew install cmake - os: osx @@ -53,6 +55,8 @@ matrix: env: BUILD_TYPE=Debug BIN_DIR=debug + before_install: + brew update install: brew install cmake script: From ecb94a170ee2c402d7ece9c881a80ecaeb839fd8 Mon Sep 17 00:00:00 2001 From: Phuntsok Drak-pa Date: Thu, 3 May 2018 13:08:49 +0200 Subject: [PATCH 16/17] testing travis-ci #15 --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 84c270a..d0aaa3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,24 +41,22 @@ matrix: # OSX Clang - os: osx osx_image: xcode8 - ruby: 2.3 env: BUILD_TYPE=Release BIN_DIR=bin before_install: brew update install: - brew install cmake + brew upgrade cmake - os: osx osx_image: xcode8 - ruby: 2.3 env: BUILD_TYPE=Debug BIN_DIR=debug before_install: brew update install: - brew install cmake + brew upgrade cmake script: - cd build - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. From 32a08d2758892cd92c6e723a6678fdc3b8f91d80 Mon Sep 17 00:00:00 2001 From: Phuntsok Drak-pa Date: Thu, 3 May 2018 13:13:59 +0200 Subject: [PATCH 17/17] testing travis-ci #16 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d0aaa3b..e64acd5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ matrix: # OSX Clang - os: osx - osx_image: xcode8 + osx_image: xcode9.3 env: BUILD_TYPE=Release BIN_DIR=bin @@ -49,7 +49,7 @@ matrix: install: brew upgrade cmake - os: osx - osx_image: xcode8 + osx_image: xcode9.3 env: BUILD_TYPE=Debug BIN_DIR=debug