浏览代码

test cmake in CIs

Andy Li 8 年之前
父节点
当前提交
173adaed56
共有 2 个文件被更改,包括 32 次插入6 次删除
  1. 14 1
      .travis.yml
  2. 18 5
      appveyor.yml

+ 14 - 1
.travis.yml

@@ -9,7 +9,20 @@ matrix:
     - haxe: development
     - haxe: development
       os: linux
       os: linux
       dist: trusty
       dist: trusty
-      env: ARCH=32
+      env: ARCH=32 BUILD=cmake
+      before_install:
+        - sudo dpkg --add-architecture i386
+        - sudo apt-get update -y
+        - sudo apt-get install gcc-multilib libz-dev:i386 zlib1g-dev:i386 libturbojpeg:i386 libpng-dev:i386 libsdl2-dev:i386 -y
+      install:
+        - cmake -DCMAKE_TOOLCHAIN_FILE=cmake/linux32.toolchain.cmake
+        - make
+      script:
+        - make test ARGS="-V"
+    - haxe: development
+      os: linux
+      dist: trusty
+      env: ARCH=32 BUILD=make
       before_install:
       before_install:
         - sudo dpkg --add-architecture i386
         - sudo dpkg --add-architecture i386
         - sudo apt-get update -y
         - sudo apt-get update -y

+ 18 - 5
appveyor.yml

@@ -6,16 +6,29 @@ image:
 platform: Win32
 platform: Win32
 configuration: Release
 configuration: Release
 
 
+environment:
+  matrix:
+    - builder: vc
+    - builder: cmake
+
 install:
 install:
   - appveyor DownloadFile https://www.libsdl.org/release/SDL2-devel-2.0.4-VC.zip
   - appveyor DownloadFile https://www.libsdl.org/release/SDL2-devel-2.0.4-VC.zip
   - 7z x SDL2-devel-2.0.4-VC.zip
   - 7z x SDL2-devel-2.0.4-VC.zip
   - move SDL2-2.0.4 include/sdl
   - move SDL2-2.0.4 include/sdl
+  # - appveyor DownloadFile http://hxbuilds.s3-website-us-east-1.amazonaws.com/builds/haxe/windows/haxe_latest.tar.gz
 
 
 build_script:
 build_script:
-  - msbuild hldll.vcxproj         /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-  - msbuild hl.vcxproj            /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-  - msbuild libs/fmt/fmt.vcxproj  /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-  - msbuild libs/sdl/sdl.vcxproj  /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-  - msbuild libs/ui/ui.vcxproj    /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+  # if "%builder%"=="vc" 
+  - if "%builder%"=="vc"      msbuild hldll.vcxproj         /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+  - if "%builder%"=="vc"      msbuild hl.vcxproj            /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+  - if "%builder%"=="vc"      msbuild libs/fmt/fmt.vcxproj  /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+  - if "%builder%"=="vc"      msbuild libs/sdl/sdl.vcxproj  /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+  - if "%builder%"=="vc"      msbuild libs/ui/ui.vcxproj    /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+  # if "%builder%"=="cmake"
+  - if "%builder%"=="cmake"   cmake -G "Visual Studio 14 2015"
+  - if "%builder%"=="cmake"   msbuild ALL_BUILD.vcxproj     /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+  - if "%builder%"=="cmake"   msbuild RUN_TESTS.vcxproj     /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
 
 
 test: off
 test: off
+# test_script:
+#   - if "%builder%"=="cmake"   msbuild RUN_TESTS.vcxproj     /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"