WIP

microsoft · Sep 27, 2019 · 65095fe · 65095fe
1 parent c0e1433
commit 65095fe
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 58 deletions.
diff --git a/CMakeSettings.json b/CMakeSettings.json
diff --git a/azure-devops/build-windows.yml b/azure-devops/build-windows.yml
@@ -23,18 +23,28 @@ jobs:
         vcpkgDirectory: '$(vcpkgLocation)'
         vcpkgTriplet: ${{ parameters.targetPlatform }}-windows
     - task: run-cmake@0
-      displayName: 'Run CMake with Ninja'
+      displayName: 'Run CMake with Ninja (Debug)'
       enabled: true
       inputs:
-        cmakeListsTxtPath: 'CMakeSettings.json'
+        cmakeListsOrSettingsJson: 'CMakeListsTxtBasic'
+        cmakeBuildType: 'Debug'
         useVcpkgToolchainFile: true
-        configurationRegexFilter: '.*${{ parameters.targetPlatform }}.*'
-        buildDirectory: $(Build.ArtifactStagingDirectory)/${{ parameters.targetPlatform }}
+        buildDirectory: $(Build.ArtifactStagingDirectory)/${{ parameters.targetPlatform }}_Debug
+        buildWithCMakeArgs: '-DCPPREST_EXCLUDE_BROTLI=OFF'
     - script: |
-        cd out\build\${{ parameters.targetPlatform }}_Release\Binaries\Debug
+        cd $(Build.ArtifactStagingDirectory)\${{ parameters.targetPlatform }}_Debug\Binaries\Release
         .\test_runner.exe *testd.dll
       displayName: 'Run tests, debug'
+    - task: run-cmake@0
+      displayName: 'Run CMake with Ninja (Release)'
+      enabled: true
+      inputs:
+        cmakeListsOrSettingsJson: 'CMakeListsTxtBasic'
+        cmakeBuildType: 'Release'
+        useVcpkgToolchainFile: true
+        buildDirectory: $(Build.ArtifactStagingDirectory)/${{ parameters.targetPlatform }}_Release
+        buildWithCMakeArgs: '-DCPPREST_EXCLUDE_BROTLI=OFF'
     - script: |
-        cd out\build\${{ parameters.targetPlatform }}_Release\Binaries\Release
+        cd $(Build.ArtifactStagingDirectory)\${{ parameters.targetPlatform }}_Release\Binaries\Release
         .\test_runner.exe *test.dll
       displayName: 'Run tests, release'