Преглед на файлове

Enhance and fix the CI scripts

Panagiotis Christopoulos Charitos преди 8 години
родител
ревизия
5a9972d1fc
променени са 2 файла, в които са добавени 21 реда и са изтрити 6 реда
  1. 20 5
      .appveyor.yml
  2. 1 1
      .travis.yml

+ 20 - 5
.appveyor.yml

@@ -6,17 +6,32 @@ branches:
 
 cache:
   - x86_64-6.3.0-release-posix-seh-rt_v5-rev1.7z
+  - x86_64-4.8.4-release-posix-seh-rt_v3-rev0.7z
 
 environment:
   MINGW_DIR: mingw64
-  MINGW_URL: https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/6.3.0/threads-posix/seh/x86_64-6.3.0-release-posix-seh-rt_v5-rev1.7z/download
-  MINGW_ARCHIVE: x86_64-6.3.0-release-posix-seh-rt_v5-rev1.7z
-
+  
   matrix:
     - BUILD_TYPE: Release
       ASSERTIONS: OFF
+      TOOLS: ON
+      MINGW_URL: https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/6.3.0/threads-posix/seh/x86_64-6.3.0-release-posix-seh-rt_v5-rev1.7z/download
+      MINGW_ARCHIVE: x86_64-6.3.0-release-posix-seh-rt_v5-rev1.7z
+    - BUILD_TYPE: Debug
+      ASSERTIONS: ON
+      TOOLS: OFF
+      MINGW_URL: https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/6.3.0/threads-posix/seh/x86_64-6.3.0-release-posix-seh-rt_v5-rev1.7z/download
+      MINGW_ARCHIVE: x86_64-6.3.0-release-posix-seh-rt_v5-rev1.7z
+    - BUILD_TYPE: Release
+      ASSERTIONS: OFF
+      TOOLS: ON
+      MINGW_URL: https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/4.8.4/threads-posix/seh/x86_64-4.8.4-release-posix-seh-rt_v3-rev0.7z/download
+      MINGW_ARCHIVE: x86_64-4.8.4-release-posix-seh-rt_v3-rev0.7z
     - BUILD_TYPE: Debug
       ASSERTIONS: ON
+      TOOLS: OFF
+      MINGW_URL: https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/4.8.4/threads-posix/seh/x86_64-4.8.4-release-posix-seh-rt_v3-rev0.7z/download
+      MINGW_ARCHIVE: x86_64-4.8.4-release-posix-seh-rt_v3-rev0.7z
 
 install:
   - git submodule update --init --recursive
@@ -34,10 +49,10 @@ before_build:
   - cmake --version
   - mkdir build
   - cd build
-  - cmake .. -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DANKI_EXTRA_CHECKS=%ASSERTIONS% -DANKI_BUILD_TESTS=ON -DANKI_BUILD_SAMPLES=ON -DANKI_BUILD_TOOLS=ON
+  - cmake .. -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DANKI_EXTRA_CHECKS=%ASSERTIONS% -DANKI_BUILD_TESTS=ON -DANKI_BUILD_SAMPLES=ON -DANKI_BUILD_TOOLS=%TOOLS%
 
 build_script:
-  - mingw32-make
+  - mingw32-make -j 2
 
 notifications:
   email: false

+ 1 - 1
.travis.yml

@@ -33,7 +33,7 @@ script:
   - mkdir build 
   - cd build
   - cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DANKI_EXTRA_CHECKS=${EXTRA_CHECKS} -DANKI_BUILD_TOOLS=ON -DANKI_BUILD_TESTS=ON -DANKI_ENABLE_TRACE=${TRACE}
-  - make
+  - make -j 2
 
 branches:
   only: