From eea69a2aa2be4e68fdaaf9a561e39c72801cf390 Mon Sep 17 00:00:00 2001 From: Rainer Schuetze Date: Sat, 1 Feb 2020 09:59:28 +0100 Subject: [PATCH] increase coverage of building with LDC by using it for the x64-debug build --- .azure-pipelines/windows-msbuild.bat | 3 ++- azure-pipelines.yml | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.azure-pipelines/windows-msbuild.bat b/.azure-pipelines/windows-msbuild.bat index 9720529ee7..a9cffeea2e 100644 --- a/.azure-pipelines/windows-msbuild.bat +++ b/.azure-pipelines/windows-msbuild.bat @@ -74,7 +74,8 @@ cp %DMD_DIR%\..\phobos\phobos%MODEL%.lib . cd "%DMD_DIR%\..\phobos" REM Check: build phobos unittests -if "%D_COMPILER%" == "ldc" cp %LDC_DIR%\lib32\libcurl.dll . +if "%D_COMPILER%_%MODEL%" == "ldc_64" cp %LDC_DIR%\lib64\libcurl.dll . +if "%D_COMPILER%_%MODEL%" == "ldc_32mscoff" cp %LDC_DIR%\lib32\libcurl.dll . if "%D_COMPILER%_%MODEL%" == "dmd_64" cp %DMD_DIR%\dmd2\windows\bin64\libcurl.dll . if "%D_COMPILER%_%MODEL%" == "dmd_32mscoff" cp %DMD_DIR%\dmd2\windows\bin\libcurl.dll . "%DM_MAKE%" -f win64.mak unittest MODEL=%MODEL% "DMD=%DMD%" "VCDIR=%VCINSTALLDIR%." "CC=%MSVC_CC%" "MAKE=%DM_MAKE%" diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a41518e59a..3ae30d0e0e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -46,7 +46,7 @@ jobs: ARCH: x86 D_COMPILER: ldc VISUALD_VER: v0.49.0 - LDC_VERSION: 1.14.0 + LDC_VERSION: 1.19.0 steps: - template: .azure-pipelines/windows-visual-studio.yml @@ -56,15 +56,15 @@ jobs: vmImage: 'vs2017-win2016' variables: VSINSTALLDIR: C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\ - HOST_DMD_VERSION: 2.086.1 strategy: matrix: - x64-debug-dmd: + x64-debug-ldc: OS: Win_64 MODEL: 64 ARCH: x64 CONFIGURATION: Debug - D_COMPILER: dmd + D_COMPILER: ldc VISUALD_VER: v0.49.0 + LDC_VERSION: 1.19.0 steps: - template: .azure-pipelines/windows-visual-studio.yml