diff options
| -rw-r--r-- | .appveyor.yml | 69 | ||||
| -rw-r--r-- | azure-pipelines.yml | 18 |
2 files changed, 13 insertions, 74 deletions
diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index 86199265..00000000 --- a/.appveyor.yml +++ /dev/null @@ -1,69 +0,0 @@ -# Specify version format -version: "{build}" - -image: - - Visual Studio 2017 - -platform: - - x64 - -# specify custom environment variables -environment: - APPVEYOR_SAVE_CACHE_ON_ERROR: true - -# build configuration, i.e. Debug, Release, etc. -configuration: - - Debug - - Release - -# scripts that are called at very beginning, before repo cloning -init: - - cmd: cmake --version - - cmd: msbuild /version - -# scripts that run after cloning repository -install: - #------------------ - # Windows 10 - #------------------ - # update vcpkg - - cmd: cd C:\tools\vcpkg - - cmd: git pull - - cmd: .\bootstrap-vcpkg.bat - - - cmd: if "%platform%"=="Win32" set VCPKG_ARCH=x86-windows - - cmd: if "%platform%"=="x64" set VCPKG_ARCH=x64-windows - - # remove outdated versions - - cmd: vcpkg remove --outdated --recurse - - # install required dependencies - - cmd: vcpkg install --recurse --triplet %VCPKG_ARCH% zlib boost-date-time boost-program-options boost-system boost-serialization boost-thread boost-units tbb eigen3 cgal[core] - - - cmd: vcpkg integrate install - - cmd: cd "%APPVEYOR_BUILD_FOLDER%" - -# preserve contents of selected directories and files across project builds -for: -- - matrix: - only: - - image: Visual Studio 2017 - cache: - - 'C:\tools\vcpkg\installed' - -build_script: - # get VCG library - - git clone https://github.com/GUDHI/gudhi-devel.git - - #------------------ - # Windows 10 - #------------------ - - cmd: if "%platform%"=="Win32" set CMAKE_GENERATOR=-G"Visual Studio 15 2017" - - cmd: if "%platform%"=="x64" set CMAKE_GENERATOR=-G"Visual Studio 15 2017 Win64" - - cmd: mkdir build && cd build - - cmd: cmake %CMAKE_GENERATOR% -DCMAKE_BUILD_TYPE=%Configuration% -DCMAKE_TOOLCHAIN_FILE="C:\tools\vcpkg\scripts\buildsystems\vcpkg.cmake" -DVCG_ROOT="%APPVEYOR_BUILD_FOLDER%\VCG" .. - - cmd: cmake --build . --target ALL_BUILD --config %Configuration% -- /maxcpucount:4 - -test_script: - - cmd: ctest --build-config %Configuration% --output-on-failure diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 091035fd..e643d349 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -10,6 +10,7 @@ pool: vmImage: 'vs2017-win2016' strategy: + maxParallel: 2 matrix: x64-Release: buildPlatform: x64 @@ -24,11 +25,18 @@ workspace: steps: - task: CMake@1 + displayName: 'CMake' inputs: - workingDirectory: 'built\cmake_$(buildPlatform)' - cmakeArgs: '..\.. -G "Visual Studio 15 2017" -A "$(buildPlatform)"' + workingDirectory: 'build' + cmakeArgs: '..\.. -G "Visual Studio 15 2017 Win64"' -- task: CMake@1 +- task: MSBuild@1 + displayName: 'Build solution GUDHIdev.sln' inputs: - workingDirectory: 'built\cmake_$(buildPlatform)' - cmakeArgs: '--build . --target test --config $(buildConfiguration) -- /m' + workingDirectory: 'build' + solution: 'GUDHIdev.sln' + msbuildArguments: '/m /p:Configuration=$(buildConfiguration) /p:Platform=$(buildPlatform)' + +- script: 'ctest -j 1 --interactive-debug-mode 0 --output-on-failure -C $(buildConfiguration) -R "in_memory"' + workingDirectory: 'build' + displayName: 'Run Ctest' |