2
0
Panagiotis Christopoulos Charitos 6 жил өмнө
parent
commit
3f20ed43eb
2 өөрчлөгдсөн 9 нэмэгдсэн , 64 устгасан
  1. 0 51
      .appveyor.yml
  2. 9 13
      .travis.yml

+ 0 - 51
.appveyor.yml

@@ -1,51 +0,0 @@
-version: '{build}'
-
-branches:
-  only: 
-  - master
-
-cache:
-  - x86_64-6.3.0-release-posix-seh-rt_v5-rev1.7z
-
-environment:
-  MINGW_DIR: mingw64
-  
-  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
-
-install:
-  - git submodule update --init --recursive
-  - if not exist "%MINGW_ARCHIVE%" appveyor DownloadFile "%MINGW_URL%" -FileName "%MINGW_ARCHIVE%"
-  - 7z x -y "%MINGW_ARCHIVE%" > nul
-  - python -m ensurepip
-  - python -m pip install cpp-coveralls==0.3.11
-  # CMake refuses to generate MinGW Makefiles if sh.exe is in the Path
-  - ps: Get-Command sh.exe -All | Remove-Item
-
-before_build:
-  - set Path=%CD%\%MINGW_DIR%\bin;%Path%
-  - g++ --version
-  - mingw32-make --version
-  - 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=%TOOLS%
-
-build_script:
-  - mingw32-make -j 2
-
-notifications:
-  - provider: Email
-    to:
-      - '{{commitAuthorEmail}}'
-    on_build_failure: true
-

+ 9 - 13
.travis.yml

@@ -7,27 +7,23 @@ python: 3.7
 cache:
   apt: true
 
-addons:
-  apt:
-    sources:
-      - sourceline: 'ppa:ubuntu-toolchain-r/test'
-    packages:
-      - gcc-6
-      - g++-6
-      - cmake
-      - libvulkan-dev
-      - libegl1-mesa-dev
+packages:
+  - gcc-6
+  - g++-6
+  - cmake
+  - libvulkan-dev
+  - libegl1-mesa-dev
 
 matrix:
   include:
     - os: linux
-      dist: trusty
+      dist: xenial
       compiler: gcc
       env:
         - GENERATOR="Unix Makefiles" BUILD_TYPE=Debug EXTRA_CHECKS=ON TRACE=ON
         - GENERATOR="Unix Makefiles" BUILD_TYPE=Release EXTRA_CHECKS=OFF TRACE=OFF
     - os: linux
-      dist: trusty
+      dist: xenial
       compiler: clang
       env:
         - GENERATOR="Unix Makefiles" BUILD_TYPE=Debug EXTRA_CHECKS=ON TRACE=ON
@@ -36,7 +32,7 @@ matrix:
       before_install:
         - choco install python3
         - export PATH="/c/Python37:/c/Python37/Scripts:$PATH"
-        - curl --silent --show-error --output VulkanSDK.exe https://vulkan.lunarg.com/sdk/download/1.1.106.0/windows/VulkanSDK-1.1.106.0-Installer.exe
+        - curl -v --output VulkanSDK.exe https://vulkan.lunarg.com/sdk/download/1.1.106.0/windows/VulkanSDK-1.1.106.0-Installer.exe
         - .\VulkanSDK.exe /S
         - export VULKAN_SDK=$TRAVIS_BUILD_DIR/VulkanSDK/1.1.106.0/x86_64
       env: