Explorar o código

Reordered target for consistency

Christophe Riccio %!s(int64=7) %!d(string=hai) anos
pai
achega
096eb6726a
Modificáronse 1 ficheiros con 44 adicións e 44 borrados
  1. 44 44
      .travis.yml

+ 44 - 44
.travis.yml

@@ -3,52 +3,28 @@ language: cpp
 matrix:
 matrix:
   include:
   include:
     - os: osx
     - os: osx
-      osx_image: xcode10
-      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 ..
-        - cmake -E time cmake --build .
-        - ctest
-      env:
-        - MATRIX_EVAL="INFO=C++17-pure-release"
-
-    - os: osx
-      osx_image: xcode10
-      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 ..
-        - cmake -E time cmake --build .
-        - ctest
-      env:
-        - MATRIX_EVAL="INFO=C++17-pure-debug"
-
-    - os: osx
-      osx_image: xcode10
+      osx_image: xcode6.4
       script:
       script:
         - cmake --version
         - 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 ..
+        - 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 .
         - cmake -E time cmake --build .
         - ctest
         - ctest
       env:
       env:
-        - MATRIX_EVAL="INFO=C++17-avx2-release"
+        - MATRIX_EVAL="INFO=C++11-pure-release"
 
 
     - os: osx
     - os: osx
-      osx_image: xcode10
+      osx_image: xcode6.4
       script:
       script:
         - cmake --version
         - 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 ..
+        - 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 .
         - cmake -E time cmake --build .
         - ctest
         - ctest
       env:
       env:
-        - MATRIX_EVAL="INFO=C++17-avx2-debug"
+        - MATRIX_EVAL="INFO=C++11-sse2-release"
 
 
     - os: osx
     - os: osx
       osx_image: xcode8
       osx_image: xcode8
@@ -99,28 +75,52 @@ matrix:
         - MATRIX_EVAL="INFO=C++14-avx-debug"
         - MATRIX_EVAL="INFO=C++14-avx-debug"
 
 
     - os: osx
     - os: osx
-      osx_image: xcode6.4
+      osx_image: xcode10
       script:
       script:
         - cmake --version
         - 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 .
         - cmake -E time cmake --build .
         - ctest
         - ctest
       env:
       env:
-        - MATRIX_EVAL="INFO=C++11-pure-release"
+        - MATRIX_EVAL="INFO=C++17-pure-release"
 
 
     - os: osx
     - os: osx
-      osx_image: xcode6.4
+      osx_image: xcode10
       script:
       script:
         - cmake --version
         - 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 .
         - cmake -E time cmake --build .
         - ctest
         - ctest
       env:
       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
     - os: linux
       addons:
       addons: