Merge branch 'dev' into dev-slice

This commit is contained in:
daan 2020-09-05 22:55:52 -07:00
commit 500a9208d5

View File

@ -8,7 +8,7 @@ trigger:
- dev - dev
- dev-slice - dev-slice
jobs: jobs:
- job: - job:
displayName: Windows displayName: Windows
pool: pool:
@ -50,7 +50,7 @@ jobs:
displayName: Linux displayName: Linux
pool: pool:
vmImage: vmImage:
ubuntu-16.04 ubuntu-18.04
strategy: strategy:
matrix: matrix:
Debug: Debug:
@ -138,3 +138,36 @@ jobs:
displayName: TestStress displayName: TestStress
# - upload: $(Build.SourcesDirectory)/$(BuildType) # - upload: $(Build.SourcesDirectory)/$(BuildType)
# artifact: mimalloc-macos-$(BuildType) # artifact: mimalloc-macos-$(BuildType)
# - job:
# displayName: Windows-2017
# pool:
# vmImage:
# vs2017-win2016
# strategy:
# matrix:
# Debug:
# BuildType: debug
# cmakeExtraArgs: -A x64 -DCMAKE_BUILD_TYPE=Debug -DMI_DEBUG_FULL=ON
# MSBuildConfiguration: Debug
# Release:
# BuildType: release
# cmakeExtraArgs: -A x64 -DCMAKE_BUILD_TYPE=Release
# MSBuildConfiguration: Release
# Secure:
# BuildType: secure
# cmakeExtraArgs: -A x64 -DCMAKE_BUILD_TYPE=Release -DMI_SECURE=ON
# MSBuildConfiguration: Release
# steps:
# - task: CMake@1
# inputs:
# workingDirectory: $(BuildType)
# cmakeArgs: .. $(cmakeExtraArgs)
# - task: MSBuild@1
# inputs:
# solution: $(BuildType)/libmimalloc.sln
# configuration: '$(MSBuildConfiguration)'
# - script: |
# cd $(BuildType)
# ctest --verbose --timeout 120
# displayName: CTest