Selaa lähdekoodia

C.I. Upgraded osx images

Christophe 5 vuotta sitten
vanhempi
sitoutus
a465b0e0d1
1 muutettua tiedostoa jossa 22 lisäystä ja 22 poistoa
  1. 22 22
      .travis.yml

+ 22 - 22
.travis.yml

@@ -76,104 +76,104 @@ matrix:
         - MATRIX_EVAL="INFO=C++11-sse2-release"
 
     - os: osx
-      osx_image: xcode8
+      osx_image: xcode10.3
       script:
         - cmake --version
         - mkdir ./build_pure_14_release
         - cd ./build_pure_14_release
         - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_14=ON -DGLM_TEST_FORCE_PURE=ON ..
-        - cmake --build .
-        - ctest --output-on-failure
+        - cmake --build . --parallel 4
+        - ctest  --parallel 4 --output-on-failure
         - cd $TRAVIS_BUILD_DIR
         - mkdir ./build_test_cmake
         - cd ./build_test_cmake
         - cmake -DCMAKE_CXX_COMPILER=$COMPILER $TRAVIS_BUILD_DIR/test/cmake/ -Dglm_DIR=$TRAVIS_BUILD_DIR/cmake/glm/
-        - cmake --build .
+        - cmake --parallel 4 --build .
       env:
         - MATRIX_EVAL="INFO=C++14-pure-release"
 
     - os: osx
-      osx_image: xcode8
+      osx_image: xcode10.3
       script:
         - cmake --version
         - mkdir ./build_sse3_14_release
         - cd ./build_sse3_14_release
         - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_14=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_SSE3=ON ..
-        - cmake --build .
-        - ctest --output-on-failure
+        - cmake --build . --parallel 4
+        - ctest --parallel 4 --output-on-failure
         - cd $TRAVIS_BUILD_DIR
         - mkdir ./build_test_cmake
         - cd ./build_test_cmake
         - cmake -DCMAKE_CXX_COMPILER=$COMPILER $TRAVIS_BUILD_DIR/test/cmake/ -Dglm_DIR=$TRAVIS_BUILD_DIR/cmake/glm/
-        - cmake --build . 
+        - cmake --build . --parallel 4
       env:
         - MATRIX_EVAL="INFO=C++14-sse3-release"
 
     - os: osx
-      osx_image: xcode8
+      osx_image: xcode10.3
       script:
         - cmake --version
         - mkdir ./build_avx_14_debug
         - cd ./build_avx_14_debug
         - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_14=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_AVX=ON ..
-        - cmake --build . 
-        - ctest --output-on-failure
+        - cmake --build . --parallel 4
+        - ctest --parallel 4 --output-on-failure
         - cd $TRAVIS_BUILD_DIR
         - mkdir ./build_test_cmake
         - cd ./build_test_cmake
         - cmake -DCMAKE_CXX_COMPILER=$COMPILER $TRAVIS_BUILD_DIR/test/cmake/ -Dglm_DIR=$TRAVIS_BUILD_DIR/cmake/glm/
-        - cmake --build .
+        - cmake --build . --parallel 4
       env:
         - MATRIX_EVAL="INFO=C++14-avx-debug"
 
     - os: osx
-      osx_image: xcode11
+      osx_image: xcode12.2
       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 --build . --parallel 1
-        - ctest --parallel 2 --output-on-failure
+        - cmake --build . --parallel 4
+        - ctest --parallel 4 --output-on-failure
         - cd $TRAVIS_BUILD_DIR
         - mkdir ./build_test_cmake
         - cd ./build_test_cmake
         - cmake -DCMAKE_CXX_COMPILER=$COMPILER $TRAVIS_BUILD_DIR/test/cmake/ -Dglm_DIR=$TRAVIS_BUILD_DIR/cmake/glm/
-        - cmake --build . --parallel 1
+        - cmake --build . --parallel 4
       env:
         - MATRIX_EVAL="INFO=C++17-pure-release"
 
     - os: osx
-      osx_image: xcode11
+      osx_image: xcode12.2
       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 --build . --parallel 1
+        - cmake --build . --parallel 4
         - ctest --parallel 4 --output-on-failure
         - cd $TRAVIS_BUILD_DIR
         - mkdir ./build_test_cmake
         - cd ./build_test_cmake
         - cmake -DCMAKE_CXX_COMPILER=$COMPILER $TRAVIS_BUILD_DIR/test/cmake/ -Dglm_DIR=$TRAVIS_BUILD_DIR/cmake/glm/
-        - cmake --build . --parallel 1
+        - cmake --build . --parallel 4
       env:
         - MATRIX_EVAL="INFO=C++17-pure-debug"
 
     - os: osx
-      osx_image: xcode11
+      osx_image: xcode12.2
       script:
         - cmake --version
         - mkdir ./build_avx_17_debug
         - cd ./build_avx_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_AVX=ON ..
-        - cmake --build . --parallel 1
+        - cmake --build . --parallel 4
         - ctest --parallel 4 --output-on-failure
         - cd $TRAVIS_BUILD_DIR
         - mkdir ./build_test_cmake
         - cd ./build_test_cmake
         - cmake -DCMAKE_CXX_COMPILER=$COMPILER $TRAVIS_BUILD_DIR/test/cmake/ -Dglm_DIR=$TRAVIS_BUILD_DIR/cmake/glm/
-        - cmake --build . --parallel 1
+        - cmake --build . --parallel 4
       env:
         - MATRIX_EVAL="INFO=C++17-avx-debug"