Browse Source

Fix travis

Panagiotis Christopoulos Charitos 6 years ago
parent
commit
787cd40e97
1 changed files with 15 additions and 15 deletions
  1. 15 15
      .travis.yml

+ 15 - 15
.travis.yml

@@ -28,20 +28,20 @@ matrix:
         - unzip VulkanSDKLib.zip -d vulkansdk
         - unzip VulkanSDKLib.zip -d vulkansdk
         - export VULKAN_SDK=$TRAVIS_BUILD_DIR/vulkansdk
         - export VULKAN_SDK=$TRAVIS_BUILD_DIR/vulkansdk
       env:
       env:
-        - GENERATOR="Visual Studio 15 2017 Win64" BUILD_TYPE=Debug EXTRA_CHECKS=ON TRACE=ON TOOLS=OFF
-        - GENERATOR="Visual Studio 15 2017 Win64" BUILD_TYPE=Release EXTRA_CHECKS=OFF TRACE=OFF TOOLS=OFF
-#    - os: linux
-#      dist: xenial
-#      compiler: gcc
-#      env:
-#        - GENERATOR="Unix Makefiles" BUILD_TYPE=Debug EXTRA_CHECKS=ON TRACE=ON TOOLS=ON
-#        - GENERATOR="Unix Makefiles" BUILD_TYPE=Release EXTRA_CHECKS=OFF TRACE=OFF TOOLS=ON
-#    - os: linux
-#      dist: xenial
-#      compiler: clang
-#      env:
-#        - GENERATOR="Unix Makefiles" BUILD_TYPE=Debug EXTRA_CHECKS=ON TRACE=ON
-#        - GENERATOR="Unix Makefiles" BUILD_TYPE=Release EXTRA_CHECKS=OFF TRACE=OFF
+        - GENERATOR="Visual Studio 15 2017 Win64" BUILD_TYPE=Debug EXTRA_CHECKS=ON TRACE=ON TOOLS=OFF TESTS=OFF
+        - GENERATOR="Visual Studio 15 2017 Win64" BUILD_TYPE=Release EXTRA_CHECKS=OFF TRACE=OFF TOOLS=OFF TESTS=OFF
+    - os: linux
+      dist: xenial
+      compiler: gcc
+      env:
+        - GENERATOR="Unix Makefiles" BUILD_TYPE=Debug EXTRA_CHECKS=ON TRACE=ON TOOLS=ON TESTS=ON
+        - GENERATOR="Unix Makefiles" BUILD_TYPE=Release EXTRA_CHECKS=OFF TRACE=OFF TOOLS=ON TESTS=ON
+    - os: linux
+      dist: xenial
+      compiler: clang
+      env:
+        - GENERATOR="Unix Makefiles" BUILD_TYPE=Debug EXTRA_CHECKS=ON TRACE=ON TOOLS=ON TESTS=ON
+        - GENERATOR="Unix Makefiles" BUILD_TYPE=Release EXTRA_CHECKS=OFF TRACE=OFF TOOLS=ON TESTS=ON
 
 
 script:
 script:
   - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then PYTHON3=$(which python); fi
   - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then PYTHON3=$(which python); fi
@@ -51,5 +51,5 @@ script:
   - echo "VULKAN_SDK ENV" $VULKAN_SDK
   - echo "VULKAN_SDK ENV" $VULKAN_SDK
   - mkdir build
   - mkdir build
   - cd build
   - cd build
-  - cmake .. -G "${GENERATOR}" -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DANKI_EXTRA_CHECKS=${EXTRA_CHECKS} -DANKI_BUILD_TOOLS=${TOOLS} -DANKI_BUILD_TESTS=ON -DANKI_TRACE=${TRACE} -DPYTHON_EXECUTABLE:FILEPATH="${PYTHON3}"
+  - cmake .. -G "${GENERATOR}" -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DANKI_EXTRA_CHECKS=${EXTRA_CHECKS} -DANKI_BUILD_TOOLS=${TOOLS} -DANKI_BUILD_TESTS=${TESTS} -DANKI_TRACE=${TRACE} -DPYTHON_EXECUTABLE:FILEPATH="${PYTHON3}"
   - cmake --build .
   - cmake --build .