From 1b571aea06612945f7590bd87bd943037b789270 Mon Sep 17 00:00:00 2001 From: daan Date: Sat, 5 Sep 2020 22:03:47 -0700 Subject: [PATCH 1/5] remove unused local warning --- src/os.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/os.c b/src/os.c index 93e022ac..6985587c 100644 --- a/src/os.c +++ b/src/os.c @@ -625,6 +625,7 @@ void _mi_os_free(void* p, size_t size, mi_stats_t* stats) { void* _mi_os_alloc_aligned(size_t size, size_t alignment, bool commit, bool* large, mi_os_tld_t* tld) { + UNUSED(tld); if (size == 0) return NULL; size = _mi_os_good_alloc_size(size); alignment = _mi_align_up(alignment, _mi_os_page_size()); From c34f303aa03bcecfec71a5e1dc1e1fc94e133738 Mon Sep 17 00:00:00 2001 From: daan Date: Sat, 5 Sep 2020 22:20:46 -0700 Subject: [PATCH 2/5] add vs2017 pipeline --- azure-pipelines.yml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 59c7d817..5a9f6dfb 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -8,6 +8,39 @@ trigger: - dev jobs: +- job: + displayName: Windows-2017 + pool: + vmImage: + windows-2017 + strategy: + matrix: + Debug: + BuildType: debug + cmakeExtraArgs: -DCMAKE_BUILD_TYPE=Debug -DMI_DEBUG_FULL=ON + MSBuildConfiguration: Debug + Release: + BuildType: release + cmakeExtraArgs: -DCMAKE_BUILD_TYPE=Release + MSBuildConfiguration: Release + Secure: + BuildType: secure + cmakeExtraArgs: -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 + - job: displayName: Windows pool: From d3aeb6253bb008d5a1aaf4b584423c782f4a7f3b Mon Sep 17 00:00:00 2001 From: daan Date: Sat, 5 Sep 2020 22:22:37 -0700 Subject: [PATCH 3/5] fix vs2017 pipeline vmimage --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5a9f6dfb..961fd34f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -12,7 +12,7 @@ jobs: displayName: Windows-2017 pool: vmImage: - windows-2017 + vs2017-win2016 strategy: matrix: Debug: @@ -82,7 +82,7 @@ jobs: displayName: Linux pool: vmImage: - ubuntu-16.04 + ubuntu-18.04 strategy: matrix: Debug: From dd0ce3c4147ddcbd6f15796b566f164c694b905b Mon Sep 17 00:00:00 2001 From: daan Date: Sat, 5 Sep 2020 22:31:59 -0700 Subject: [PATCH 4/5] specify x64 for vs2017 pipeline --- azure-pipelines.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 961fd34f..e0c888bb 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,15 +17,15 @@ jobs: matrix: Debug: BuildType: debug - cmakeExtraArgs: -DCMAKE_BUILD_TYPE=Debug -DMI_DEBUG_FULL=ON + cmakeExtraArgs: -A x64 -DCMAKE_BUILD_TYPE=Debug -DMI_DEBUG_FULL=ON MSBuildConfiguration: Debug Release: BuildType: release - cmakeExtraArgs: -DCMAKE_BUILD_TYPE=Release + cmakeExtraArgs: -A x64 -DCMAKE_BUILD_TYPE=Release MSBuildConfiguration: Release Secure: BuildType: secure - cmakeExtraArgs: -DCMAKE_BUILD_TYPE=Release -DMI_SECURE=ON + cmakeExtraArgs: -A x64 -DCMAKE_BUILD_TYPE=Release -DMI_SECURE=ON MSBuildConfiguration: Release steps: - task: CMake@1 From a9ad0cb68da1451f672c0f29b4476e6be755b154 Mon Sep 17 00:00:00 2001 From: daan Date: Sat, 5 Sep 2020 22:36:59 -0700 Subject: [PATCH 5/5] comment out vs2017 pipeline --- azure-pipelines.yml | 68 ++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e0c888bb..5ffb1ef3 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -7,40 +7,7 @@ trigger: - master - dev -jobs: -- 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 - +jobs: - job: displayName: Windows pool: @@ -164,3 +131,36 @@ jobs: displayName: CTest # - upload: $(Build.SourcesDirectory)/$(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