From b2706a05bb280579bcd94fb733a212f2ae044a80 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 25 Jun 2019 10:00:41 +0200 Subject: [PATCH 1/2] Set up CI with Azure Pipelines This sets up an Azure Pipeline to build the library, publishing the artifacts for convenience. Signed-off-by: Johannes Schindelin --- azure-pipelines.yml | 51 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 azure-pipelines.yml diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 00000000..a73ac1a0 --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,51 @@ +# Starter pipeline +# Start with a minimal pipeline that you can customize to build and deploy your code. +# Add steps that build, run tests, deploy, and more: +# https://aka.ms/yaml + +trigger: +- master +- dev + +jobs: +- job: + displayName: Windows + pool: + vmImage: + windows-2019 + steps: + - task: CMake@1 + inputs: + workingDirectory: 'build' + cmakeArgs: .. + - task: MSBuild@1 + inputs: + solution: build/libmimalloc.sln + - upload: $(Build.SourcesDirectory)/build + artifact: windows +- job: + displayName: Linux + pool: + vmImage: + ubuntu-16.04 + steps: + - task: CMake@1 + inputs: + workingDirectory: 'build' + cmakeArgs: .. + - script: make -j$(nproc) -C build + - upload: $(Build.SourcesDirectory)/build + artifact: ubuntu +- job: + displayName: macOS + pool: + vmImage: + macOS-10.14 + steps: + - task: CMake@1 + inputs: + workingDirectory: 'build' + cmakeArgs: .. + - script: make -j$(sysctl -n hw.ncpu) -C build + - upload: $(Build.SourcesDirectory)/build + artifact: macos From 47e822c70f4cddf4e80708ba986bd045873ea124 Mon Sep 17 00:00:00 2001 From: Jim Huang Date: Tue, 25 Jun 2019 21:59:20 +0800 Subject: [PATCH 2/2] Correct the use of MI_DEBUG by conditional build MI_DEBUG is a macro rather than a variable. --- src/init.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/init.c b/src/init.c index 7348851e..854aefee 100644 --- a/src/init.c +++ b/src/init.c @@ -234,10 +234,12 @@ static bool _mi_heap_done() { } _mi_os_free(heap, sizeof(mi_thread_data_t), &_mi_stats_main); } - else if (MI_DEBUG > 0) { +#if (MI_DEBUG > 0) + else { _mi_heap_destroy_pages(heap); mi_assert_internal(heap->tld->heap_backing == &_mi_heap_main); } +#endif return false; }