From 096eb6726add478b2ad099ec6947acfc787a8774 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sun, 19 Aug 2018 15:07:13 +0200 Subject: [PATCH] Reordered target for consistency --- .travis.yml | 88 ++++++++++++++++++++++++++--------------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/.travis.yml b/.travis.yml index a37fbdbb..2d64aabe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,52 +3,28 @@ language: cpp matrix: include: - os: osx - osx_image: xcode10 + osx_image: xcode6.4 script: - cmake --version - - mkdir ./build_pure_17_release - - cd ./build_pure_17_release - - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_17=ON -DGLM_TEST_FORCE_PURE=ON .. + - mkdir ./build_pure_11_release + - cd ./build_pure_11_release + - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_11=ON -DGLM_TEST_FORCE_PURE=ON .. - cmake -E time cmake --build . - ctest env: - - MATRIX_EVAL="INFO=C++17-pure-release" + - MATRIX_EVAL="INFO=C++11-pure-release" - os: osx - osx_image: xcode10 + osx_image: xcode6.4 script: - cmake --version - - mkdir ./build_pure_17_debug - - cd ./build_pure_17_debug - - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_17=ON -DGLM_TEST_FORCE_PURE=ON .. + - mkdir ./build_sse2_11_release + - cd ./build_sse2_11_release + - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_11=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_SSE2=ON .. - cmake -E time cmake --build . - ctest env: - - MATRIX_EVAL="INFO=C++17-pure-debug" - - - os: osx - osx_image: xcode10 - script: - - cmake --version - - mkdir ./build_avx2_17_release - - cd ./build_avx2_17_release - - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_17=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_AVX2=ON .. - - cmake -E time cmake --build . - - ctest - env: - - MATRIX_EVAL="INFO=C++17-avx2-release" - - - os: osx - osx_image: xcode10 - script: - - cmake --version - - mkdir ./build_avx2_17_debug - - cd ./build_avx2_17_debug - - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_17=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_AVX2=ON .. - - cmake -E time cmake --build . - - ctest - env: - - MATRIX_EVAL="INFO=C++17-avx2-debug" + - MATRIX_EVAL="INFO=C++11-sse2-release" - os: osx osx_image: xcode8 @@ -99,28 +75,52 @@ matrix: - MATRIX_EVAL="INFO=C++14-avx-debug" - os: osx - osx_image: xcode6.4 + osx_image: xcode10 script: - cmake --version - - mkdir ./build_pure_11_release - - cd ./build_pure_11_release - - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_11=ON -DGLM_TEST_FORCE_PURE=ON .. + - mkdir ./build_pure_17_release + - cd ./build_pure_17_release + - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_17=ON -DGLM_TEST_FORCE_PURE=ON .. - cmake -E time cmake --build . - ctest env: - - MATRIX_EVAL="INFO=C++11-pure-release" + - MATRIX_EVAL="INFO=C++17-pure-release" - os: osx - osx_image: xcode6.4 + osx_image: xcode10 script: - cmake --version - - mkdir ./build_sse2_11_release - - cd ./build_sse2_11_release - - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_11=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_SSE2=ON .. + - mkdir ./build_pure_17_debug + - cd ./build_pure_17_debug + - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_17=ON -DGLM_TEST_FORCE_PURE=ON .. - cmake -E time cmake --build . - ctest env: - - MATRIX_EVAL="INFO=C++11-sse2-release" + - MATRIX_EVAL="INFO=C++17-pure-debug" + + - os: osx + osx_image: xcode10 + script: + - cmake --version + - mkdir ./build_avx2_17_release + - cd ./build_avx2_17_release + - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_17=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_AVX2=ON .. + - cmake -E time cmake --build . + - ctest + env: + - MATRIX_EVAL="INFO=C++17-avx2-release" + + - os: osx + osx_image: xcode10 + script: + - cmake --version + - mkdir ./build_avx2_17_debug + - cd ./build_avx2_17_debug + - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_17=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_AVX2=ON .. + - cmake -E time cmake --build . + - ctest + env: + - MATRIX_EVAL="INFO=C++17-avx2-debug" - os: linux addons: