diff --git a/appveyor.yml b/appveyor.yml index 5afea87227a05d12d7518ea85f4632519ad7d66b..39bf8332b0b37622a4a864a2f07cad81645a8010 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,36 +1,64 @@ version: 4.6.0.{build} -cache: - - C:\Users\appveyor\.ant - - C:\ProgramData\chocolatey\bin - - C:\ProgramData\chocolatey\lib - -image: Visual Studio 2015 - -install: - - ps: choco install nuget.commandline - - ps: choco install ant --ignore-dependencies - - ps: $env:Path="C:\Program Files\Java\jdk1.8.0\bin;$($env:Path);C:\ProgramData\chocolatey\lib\ant" - - set PATH=C:\Python36-x64\';%PATH% -environment: - global: - TSK_HOME: "%APPVEYOR_BUILD_FOLDER%" - PYTHON: "C:\\Python36-x64" - JDK_HOME: C:\Program Files\Java\jdk1.8.0 -services: - -before_build: - - nuget restore win32\libtsk -PackagesDirectory win32\packages - -build_script: - - python win32\updateAndBuildAll.py -m - - ps: ant -version - - ps: pushd bindings/java - - cmd: ant -q dist - - ps: popd - - ps: pushd case-uco/java - - cmd: ant -q - - ps: popd - -test_script: - - cmd: ant -q -f bindings/java test +environment: + matrix: + + - job_name: Windows Build + appveyor_build_worker_image: Visual Studio 2015 + - job_name: Linux Build + appveyor_build_worker_image: Ubuntu + +matrix: + fast_finish: true + + +# job-specific configurations +for: + + - + matrix: + only: + - job_name: Windows Build + + cache: + - C:\Users\appveyor\.ant + - C:\ProgramData\chocolatey\bin + - C:\ProgramData\chocolatey\lib + + install: + - ps: choco install nuget.commandline + - ps: choco install ant --ignore-dependencies + - ps: $env:Path="C:\Program Files\Java\jdk1.8.0\bin;$($env:Path);C:\ProgramData\chocolatey\lib\ant" + - set PATH=C:\Python36-x64\';%PATH% + environment: + global: + TSK_HOME: "%APPVEYOR_BUILD_FOLDER%" + PYTHON: "C:\\Python36-x64" + JDK_HOME: C:\Program Files\Java\jdk1.8.0 + services: + + before_build: + - nuget restore win32\libtsk -PackagesDirectory win32\packages + + build_script: + - python win32\updateAndBuildAll.py -m + - ps: ant -version + - ps: pushd bindings/java + - cmd: ant -q dist + - ps: popd + - ps: pushd case-uco/java + - cmd: ant -q + - ps: popd + + test_script: + - cmd: ant -q -f bindings/java test + + - + matrix: + only: + - job_name: Linux build + + build_script: + - ./bootstrap + - ./configure + - make