From b40f3b3f4a094620fb9f138104a17c0a3d54925d Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Fri, 20 Sep 2019 18:54:40 -0600 Subject: [PATCH 1/9] Don't use /permissive- with /ZW. --- Release/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Release/CMakeLists.txt b/Release/CMakeLists.txt index 4b6433a93a..6d2521b016 100644 --- a/Release/CMakeLists.txt +++ b/Release/CMakeLists.txt @@ -187,10 +187,10 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") if (WINDOWS_STORE OR WINDOWS_PHONE) add_compile_options(/ZW) - endif() - - if (NOT (MSVC_VERSION LESS 1920)) - add_compile_options(/permissive-) + else() + if (NOT (MSVC_VERSION LESS 1920)) + add_compile_options(/permissive-) + endif() endif() else() message("-- Unknown compiler, success is doubtful.") From 42f48fded2c50931671ff2e79427a1e55677196c Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Fri, 20 Sep 2019 18:56:39 -0600 Subject: [PATCH 2/9] Add VS2019 configurations to Azure Pipelines. --- azure-pipelines.yml | 83 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8c878f0901..6cc3aebeda 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,6 +1,89 @@ # CppRestSdk Azure Pipelines Configuration jobs: + - job: Windows_VS2019_x86 + pool: + vmImage: 'windows-latest' + steps: + - script: .\vcpkg\bootstrap-vcpkg.bat + displayName: Bootstrap vcpkg + - script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp brotli --vcpkg-root .\vcpkg + displayName: vcpkg install dependencies + - script: mkdir build.common + displayName: Make Build Directory + - task: CMake@1 + inputs: + workingDirectory: 'build.common' + cmakeArgs: '-DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake -DCPPREST_EXCLUDE_BROTLI=OFF ..' + - task: MSBuild@1 + inputs: + solution: 'build.common/ALL_BUILD.vcxproj' + maximumCpuCount: true + - script: | + cd build.common\Release\Binaries\Debug + .\test_runner.exe *testd.dll + displayName: 'Run tests, debug' + - task: MSBuild@1 + inputs: + solution: 'build.common/ALL_BUILD.vcxproj' + maximumCpuCount: true + configuration: 'Release' + - script: | + cd build.common\Release\Binaries\Release + .\test_runner.exe *test.dll + displayName: 'Run tests, release' + - job: Windows_VS2019_x64 + pool: + vmImage: 'windows-latest' + steps: + - script: .\vcpkg\bootstrap-vcpkg.bat + displayName: Bootstrap vcpkg + - script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp brotli --triplet x64-windows --vcpkg-root .\vcpkg + displayName: vcpkg install dependencies + - script: mkdir build.common + displayName: Make Build Directory + - task: CMake@1 + inputs: + workingDirectory: 'build.common' + cmakeArgs: '-A x64 -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake -DCPPREST_EXCLUDE_BROTLI=OFF ..' + - task: MSBuild@1 + inputs: + solution: 'build.common/ALL_BUILD.vcxproj' + maximumCpuCount: true + platform: 'x64' + - script: | + cd build.common\Release\Binaries\Debug + .\test_runner.exe *testd.dll + displayName: 'Run tests, debug' + - task: MSBuild@1 + inputs: + solution: 'build.common/ALL_BUILD.vcxproj' + maximumCpuCount: true + platform: 'x64' + configuration: 'Release' + - script: | + cd build.common\Release\Binaries\Release + .\test_runner.exe *test.dll + displayName: 'Run tests, release' + - job: Windows_VS2019_UWP + pool: + vmImage: 'windows-latest' + steps: + - script: .\vcpkg\bootstrap-vcpkg.bat + displayName: Bootstrap vcpkg + - script: .\vcpkg\vcpkg.exe install zlib --triplet x64-uwp --vcpkg-root .\vcpkg + displayName: vcpkg install dependencies + - script: mkdir build.common + displayName: Make Build Directory + - task: CMake@1 + inputs: + workingDirectory: 'build.common' + cmakeArgs: '-A x64 -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..' + - task: MSBuild@1 + inputs: + solution: 'build.common/ALL_BUILD.vcxproj' + maximumCpuCount: true + platform: 'x64' - job: Windows_VS2017_x86 pool: vmImage: 'vs2017-win2016' From 8f0a93e24cf0b0861bd8b23913d10663a82a5685 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 26 Sep 2019 19:31:57 -0700 Subject: [PATCH 3/9] Attempt templates and other tricks I learned from https://github.com/microsoft/STL/pull/114 --- CMakeSettings.json | 52 +++++++ azure-devops/build-windows.yml | 40 ++++++ azure-devops/vcpkg-windows.txt | 7 + azure-pipelines.yml | 241 ++++----------------------------- 4 files changed, 129 insertions(+), 211 deletions(-) create mode 100644 CMakeSettings.json create mode 100644 azure-devops/build-windows.yml create mode 100644 azure-devops/vcpkg-windows.txt diff --git a/CMakeSettings.json b/CMakeSettings.json new file mode 100644 index 0000000000..eea7b7957e --- /dev/null +++ b/CMakeSettings.json @@ -0,0 +1,52 @@ +{ + "configurations": [ + { + "name": "x86_Debug", + "buildCommandArgs": "-v", + "buildRoot": "${projectDir}\\out\\build\\${name}", + "cmakeCommandArgs": "", + "configurationType": "Debug", + "ctestCommandArgs": "", + "generator": "Ninja", + "inheritEnvironments": [ "msvc_x86" ], + "installRoot": "${projectDir}\\out\\install\\${name}", + "variables": [] + }, + { + "name": "x86_Release", + "buildCommandArgs": "-v", + "buildRoot": "${projectDir}\\out\\build\\${name}", + "cmakeCommandArgs": "", + "configurationType": "Release", + "ctestCommandArgs": "", + "generator": "Ninja", + "inheritEnvironments": [ "msvc_x86" ], + "installRoot": "${projectDir}\\out\\install\\${name}", + "variables": [] + }, + { + "name": "x64_Debug", + "buildCommandArgs": "-v", + "buildRoot": "${projectDir}\\out\\build\\${name}", + "cmakeCommandArgs": "", + "configurationType": "Debug", + "ctestCommandArgs": "", + "generator": "Ninja", + "inheritEnvironments": [ "msvc_x64_x64" ], + "installRoot": "${projectDir}\\out\\install\\${name}", + "variables": [] + }, + { + "name": "x64_Releaes", + "buildCommandArgs": "-v", + "buildRoot": "${projectDir}\\out\\build\\${name}", + "cmakeCommandArgs": "", + "configurationType": "Release", + "ctestCommandArgs": "", + "generator": "Ninja", + "inheritEnvironments": [ "msvc_x64_x64" ], + "installRoot": "${projectDir}\\out\\install\\${name}", + "variables": [] + } + ] +} diff --git a/azure-devops/build-windows.yml b/azure-devops/build-windows.yml new file mode 100644 index 0000000000..11b0b9d2c6 --- /dev/null +++ b/azure-devops/build-windows.yml @@ -0,0 +1,40 @@ +parameters: + name: 'Windows_VS2019_x86' + targetPlatform: 'x86' + image: 'windows-latest' + +jobs: +- job: ${{ parameters.name }} + pool: + vmImage: ${{ parameters.image }} + variables: + vcpkgLocation: '$(Build.SourcesDirectory)/vcpkg' + vcpkgResponseFile: $(Build.SourcesDirectory)/azure-devops/vcpkg-windows.txt + steps: + - task: CacheBeta@0 + displayName: Cache vcpkg + inputs: + key: $(vcpkgResponseFile) | $(Build.SourcesDirectory)/.git/modules/vcpkg/HEAD | ${{ parameters.targetPlatform }} | ${{ parameters.image }} + path: '$(vcpkgLocation)' + - task: run-vcpkg@0 + displayName: 'Run vcpkg' + inputs: + vcpkgArguments: '@$(vcpkgResponseFile)' + vcpkgDirectory: '$(vcpkgLocation)' + vcpkgTriplet: ${{ parameters.targetPlatform }}-windows + - task: run-cmake@0 + displayName: 'Run CMake with Ninja' + enabled: true + inputs: + cmakeListsTxtPath: 'CMakeSettings.json' + useVcpkgToolchainFile: true + configurationRegexFilter: '.*${{ parameters.targetPlatform }}.*' + buildDirectory: $(Build.ArtifactStagingDirectory)/${{ parameters.targetPlatform }} + - script: | + cd out\build\${{ parameters.targetPlatform }}_Release\Binaries\Debug + .\test_runner.exe *testd.dll + displayName: 'Run tests, debug' + - script: | + cd out\build\${{ parameters.targetPlatform }}_Release\Binaries\Release + .\test_runner.exe *test.dll + displayName: 'Run tests, release' diff --git a/azure-devops/vcpkg-windows.txt b/azure-devops/vcpkg-windows.txt new file mode 100644 index 0000000000..582d18dcdb --- /dev/null +++ b/azure-devops/vcpkg-windows.txt @@ -0,0 +1,7 @@ +openssl +boost-system +boost-date-time +boost-regex +boost-interprocess +websocketpp +brotli diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6cc3aebeda..8fc6f54365 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,70 +1,36 @@ # CppRestSdk Azure Pipelines Configuration jobs: - - job: Windows_VS2019_x86 - pool: - vmImage: 'windows-latest' - steps: - - script: .\vcpkg\bootstrap-vcpkg.bat - displayName: Bootstrap vcpkg - - script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp brotli --vcpkg-root .\vcpkg - displayName: vcpkg install dependencies - - script: mkdir build.common - displayName: Make Build Directory - - task: CMake@1 - inputs: - workingDirectory: 'build.common' - cmakeArgs: '-DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake -DCPPREST_EXCLUDE_BROTLI=OFF ..' - - task: MSBuild@1 - inputs: - solution: 'build.common/ALL_BUILD.vcxproj' - maximumCpuCount: true - - script: | - cd build.common\Release\Binaries\Debug - .\test_runner.exe *testd.dll - displayName: 'Run tests, debug' - - task: MSBuild@1 - inputs: - solution: 'build.common/ALL_BUILD.vcxproj' - maximumCpuCount: true - configuration: 'Release' - - script: | - cd build.common\Release\Binaries\Release - .\test_runner.exe *test.dll - displayName: 'Run tests, release' - - job: Windows_VS2019_x64 - pool: - vmImage: 'windows-latest' - steps: - - script: .\vcpkg\bootstrap-vcpkg.bat - displayName: Bootstrap vcpkg - - script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp brotli --triplet x64-windows --vcpkg-root .\vcpkg - displayName: vcpkg install dependencies - - script: mkdir build.common - displayName: Make Build Directory - - task: CMake@1 - inputs: - workingDirectory: 'build.common' - cmakeArgs: '-A x64 -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake -DCPPREST_EXCLUDE_BROTLI=OFF ..' - - task: MSBuild@1 - inputs: - solution: 'build.common/ALL_BUILD.vcxproj' - maximumCpuCount: true - platform: 'x64' - - script: | - cd build.common\Release\Binaries\Debug - .\test_runner.exe *testd.dll - displayName: 'Run tests, debug' - - task: MSBuild@1 - inputs: - solution: 'build.common/ALL_BUILD.vcxproj' - maximumCpuCount: true - platform: 'x64' - configuration: 'Release' - - script: | - cd build.common\Release\Binaries\Release - .\test_runner.exe *test.dll - displayName: 'Run tests, release' + - template: azure-devops/build-windows.yml + parameters: + name: 'Windows_VS2019_x86' + targetPlatform: x86 + image: 'windows-latest' + - template: azure-devops/build-windows.yml + parameters: + name: 'Windows_VS2019_x64' + targetPlatform: x64 + image: 'windows-latest' + - template: azure-devops/build-windows.yml + parameters: + name: 'Windows_VS2017_x86' + targetPlatform: x86 + image: 'vs2017-win2016' + - template: azure-devops/build-windows.yml + parameters: + name: 'Windows_VS2017_x64' + targetPlatform: x64 + image: 'vs2017-win2016' + - template: azure-devops/build-windows.yml + parameters: + name: 'Windows_VS2015_x86' + targetPlatform: x86 + image: 'vs2015-win2012r2' + - template: azure-devops/build-windows.yml + parameters: + name: 'Windows_VS2015_x64' + targetPlatform: x64 + image: 'vs2015-win2012r2' - job: Windows_VS2019_UWP pool: vmImage: 'windows-latest' @@ -84,153 +50,6 @@ jobs: solution: 'build.common/ALL_BUILD.vcxproj' maximumCpuCount: true platform: 'x64' - - job: Windows_VS2017_x86 - pool: - vmImage: 'vs2017-win2016' - steps: - - script: .\vcpkg\bootstrap-vcpkg.bat - displayName: Bootstrap vcpkg - - script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp brotli --vcpkg-root .\vcpkg - displayName: vcpkg install dependencies - - script: mkdir build.common - displayName: Make Build Directory - - task: CMake@1 - inputs: - workingDirectory: 'build.common' - cmakeArgs: '-DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake -DCPPREST_EXCLUDE_BROTLI=OFF ..' - - task: MSBuild@1 - inputs: - solution: 'build.common/ALL_BUILD.vcxproj' - maximumCpuCount: true - - script: | - cd build.common\Release\Binaries\Debug - .\test_runner.exe *testd.dll - displayName: 'Run tests, debug' - - task: MSBuild@1 - inputs: - solution: 'build.common/ALL_BUILD.vcxproj' - maximumCpuCount: true - configuration: 'Release' - - script: | - cd build.common\Release\Binaries\Release - .\test_runner.exe *test.dll - displayName: 'Run tests, release' - - job: Windows_VS2017_x64 - pool: - vmImage: 'vs2017-win2016' - steps: - - script: .\vcpkg\bootstrap-vcpkg.bat - displayName: Bootstrap vcpkg - - script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp brotli --triplet x64-windows --vcpkg-root .\vcpkg - displayName: vcpkg install dependencies - - script: mkdir build.common - displayName: Make Build Directory - - task: CMake@1 - inputs: - workingDirectory: 'build.common' - cmakeArgs: '-A x64 -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake -DCPPREST_EXCLUDE_BROTLI=OFF ..' - - task: MSBuild@1 - inputs: - solution: 'build.common/ALL_BUILD.vcxproj' - maximumCpuCount: true - platform: 'x64' - - script: | - cd build.common\Release\Binaries\Debug - .\test_runner.exe *testd.dll - displayName: 'Run tests, debug' - - task: MSBuild@1 - inputs: - solution: 'build.common/ALL_BUILD.vcxproj' - maximumCpuCount: true - platform: 'x64' - configuration: 'Release' - - script: | - cd build.common\Release\Binaries\Release - .\test_runner.exe *test.dll - displayName: 'Run tests, release' - - job: Windows_VS2017_UWP - pool: - vmImage: 'vs2017-win2016' - steps: - - script: .\vcpkg\bootstrap-vcpkg.bat - displayName: Bootstrap vcpkg - - script: .\vcpkg\vcpkg.exe install zlib --triplet x64-uwp --vcpkg-root .\vcpkg - displayName: vcpkg install dependencies - - script: mkdir build.common - displayName: Make Build Directory - - task: CMake@1 - inputs: - workingDirectory: 'build.common' - cmakeArgs: '-A x64 -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..' - - task: MSBuild@1 - inputs: - solution: 'build.common/ALL_BUILD.vcxproj' - maximumCpuCount: true - platform: 'x64' - - job: Windows_VS2015_x86 - pool: - vmImage: 'vs2015-win2012r2' - steps: - - script: .\vcpkg\bootstrap-vcpkg.bat - displayName: Bootstrap vcpkg - - script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp brotli --vcpkg-root .\vcpkg - displayName: vcpkg install dependencies - - script: mkdir build.common - displayName: Make Build Directory - - task: CMake@1 - inputs: - workingDirectory: 'build.common' - cmakeArgs: '-DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake -DCPPREST_EXCLUDE_BROTLI=OFF ..' - - task: MSBuild@1 - inputs: - solution: 'build.common/ALL_BUILD.vcxproj' - maximumCpuCount: true - - script: | - cd build.common\Release\Binaries\Debug - .\test_runner.exe *testd.dll - displayName: 'Run tests, debug' - - task: MSBuild@1 - inputs: - solution: 'build.common/ALL_BUILD.vcxproj' - maximumCpuCount: true - configuration: 'Release' - - script: | - cd build.common\Release\Binaries\Release - .\test_runner.exe *test.dll - displayName: 'Run tests, release' - - job: Windows_VS2015_x64 - pool: - vmImage: 'vs2015-win2012r2' - steps: - - script: .\vcpkg\bootstrap-vcpkg.bat - displayName: Bootstrap vcpkg - - script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp brotli --triplet x64-windows --vcpkg-root .\vcpkg - displayName: vcpkg install dependencies - - script: mkdir build.common - displayName: Make Build Directory - - task: CMake@1 - inputs: - workingDirectory: 'build.common' - cmakeArgs: '-A x64 -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake -DCPPREST_EXCLUDE_BROTLI=OFF ..' - - task: MSBuild@1 - inputs: - solution: 'build.common/ALL_BUILD.vcxproj' - maximumCpuCount: true - platform: 'x64' - - script: | - cd build.common\Release\Binaries\Debug - .\test_runner.exe *testd.dll - displayName: 'Run tests, debug' - - task: MSBuild@1 - inputs: - solution: 'build.common/ALL_BUILD.vcxproj' - maximumCpuCount: true - platform: 'x64' - configuration: 'Release' - - script: | - cd build.common\Release\Binaries\Release - .\test_runner.exe *test.dll - displayName: 'Run tests, release' - job: Ubuntu_1604_Apt pool: vmImage: 'Ubuntu 16.04' From c0e14335078945d89a1d767246a8344cc44ebc21 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 26 Sep 2019 19:49:34 -0700 Subject: [PATCH 4/9] Update vcpkg. --- vcpkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcpkg b/vcpkg index b7d6160b80..ee0bfad1cf 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit b7d6160b80f417137bc480137b946c91f3272bf5 +Subproject commit ee0bfad1cfa11e048823e2d02d9f619db7d94a3f From fb8857c34c819d0cad466e8c16aedb11bd55042b Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 26 Sep 2019 22:38:35 -0700 Subject: [PATCH 5/9] WIP --- CMakeSettings.json | 52 ---------------------------------- azure-devops/build-windows.yml | 22 ++++++++++---- 2 files changed, 16 insertions(+), 58 deletions(-) delete mode 100644 CMakeSettings.json diff --git a/CMakeSettings.json b/CMakeSettings.json deleted file mode 100644 index eea7b7957e..0000000000 --- a/CMakeSettings.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "configurations": [ - { - "name": "x86_Debug", - "buildCommandArgs": "-v", - "buildRoot": "${projectDir}\\out\\build\\${name}", - "cmakeCommandArgs": "", - "configurationType": "Debug", - "ctestCommandArgs": "", - "generator": "Ninja", - "inheritEnvironments": [ "msvc_x86" ], - "installRoot": "${projectDir}\\out\\install\\${name}", - "variables": [] - }, - { - "name": "x86_Release", - "buildCommandArgs": "-v", - "buildRoot": "${projectDir}\\out\\build\\${name}", - "cmakeCommandArgs": "", - "configurationType": "Release", - "ctestCommandArgs": "", - "generator": "Ninja", - "inheritEnvironments": [ "msvc_x86" ], - "installRoot": "${projectDir}\\out\\install\\${name}", - "variables": [] - }, - { - "name": "x64_Debug", - "buildCommandArgs": "-v", - "buildRoot": "${projectDir}\\out\\build\\${name}", - "cmakeCommandArgs": "", - "configurationType": "Debug", - "ctestCommandArgs": "", - "generator": "Ninja", - "inheritEnvironments": [ "msvc_x64_x64" ], - "installRoot": "${projectDir}\\out\\install\\${name}", - "variables": [] - }, - { - "name": "x64_Releaes", - "buildCommandArgs": "-v", - "buildRoot": "${projectDir}\\out\\build\\${name}", - "cmakeCommandArgs": "", - "configurationType": "Release", - "ctestCommandArgs": "", - "generator": "Ninja", - "inheritEnvironments": [ "msvc_x64_x64" ], - "installRoot": "${projectDir}\\out\\install\\${name}", - "variables": [] - } - ] -} diff --git a/azure-devops/build-windows.yml b/azure-devops/build-windows.yml index 11b0b9d2c6..811117807f 100644 --- 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 + cmakeAppendedArgs: '-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 + cmakeAppendedArgs: '-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' From 68a1de278a05bbf80d21c369a883d0ab733aee8b Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 26 Sep 2019 23:40:05 -0700 Subject: [PATCH 6/9] Don't fetch websocketspp by default. --- .gitmodules | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmodules b/.gitmodules index 5a33829602..00708a2e6e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,4 @@ [submodule "websocketspp"] path = Release/libs/websocketpp url = https://github.com/zaphoyd/websocketpp/ + fetchRecurseSubmodules = false From 4a737e9a9e5068f55265330686553210aed29658 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 26 Sep 2019 23:48:07 -0700 Subject: [PATCH 7/9] Typo tastic. --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 00708a2e6e..54befd07da 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "vcpkg"] path = vcpkg url = https://github.com/Microsoft/vcpkg -[submodule "websocketspp"] +[submodule "websocketpp"] path = Release/libs/websocketpp url = https://github.com/zaphoyd/websocketpp/ fetchRecurseSubmodules = false From 2d971b5c13e6dde0b40cad0ff1d22eb96d317920 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Fri, 27 Sep 2019 13:03:35 -0700 Subject: [PATCH 8/9] Debug things --- azure-devops/build-windows.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/azure-devops/build-windows.yml b/azure-devops/build-windows.yml index 811117807f..ee8c3f989a 100644 --- a/azure-devops/build-windows.yml +++ b/azure-devops/build-windows.yml @@ -32,6 +32,9 @@ jobs: buildDirectory: $(Build.ArtifactStagingDirectory)/${{ parameters.targetPlatform }}_Debug cmakeAppendedArgs: '-DCPPREST_EXCLUDE_BROTLI=OFF' - script: | + echo $(Build.ArtifactStagingDirectory)\${{ parameters.targetPlatform }}_Debug\Binaries\Release + pwd + dir /s cd $(Build.ArtifactStagingDirectory)\${{ parameters.targetPlatform }}_Debug\Binaries\Release .\test_runner.exe *testd.dll displayName: 'Run tests, debug' @@ -45,6 +48,7 @@ jobs: buildDirectory: $(Build.ArtifactStagingDirectory)/${{ parameters.targetPlatform }}_Release cmakeAppendedArgs: '-DCPPREST_EXCLUDE_BROTLI=OFF' - script: | + echo $(Build.ArtifactStagingDirectory)\${{ parameters.targetPlatform }}_Release\Binaries\Release cd $(Build.ArtifactStagingDirectory)\${{ parameters.targetPlatform }}_Release\Binaries\Release .\test_runner.exe *test.dll displayName: 'Run tests, release' From 82a3e79d5d6e9fa74bd640fae9d05a60c4ac2c39 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Fri, 27 Sep 2019 13:25:52 -0700 Subject: [PATCH 9/9] Fix paths? --- azure-devops/build-windows.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/azure-devops/build-windows.yml b/azure-devops/build-windows.yml index ee8c3f989a..45ea392a82 100644 --- a/azure-devops/build-windows.yml +++ b/azure-devops/build-windows.yml @@ -32,10 +32,7 @@ jobs: buildDirectory: $(Build.ArtifactStagingDirectory)/${{ parameters.targetPlatform }}_Debug cmakeAppendedArgs: '-DCPPREST_EXCLUDE_BROTLI=OFF' - script: | - echo $(Build.ArtifactStagingDirectory)\${{ parameters.targetPlatform }}_Debug\Binaries\Release - pwd - dir /s - cd $(Build.ArtifactStagingDirectory)\${{ parameters.targetPlatform }}_Debug\Binaries\Release + cd $(Build.ArtifactStagingDirectory)\${{ parameters.targetPlatform }}_Debug\Release\Binaries .\test_runner.exe *testd.dll displayName: 'Run tests, debug' - task: run-cmake@0 @@ -48,7 +45,6 @@ jobs: buildDirectory: $(Build.ArtifactStagingDirectory)/${{ parameters.targetPlatform }}_Release cmakeAppendedArgs: '-DCPPREST_EXCLUDE_BROTLI=OFF' - script: | - echo $(Build.ArtifactStagingDirectory)\${{ parameters.targetPlatform }}_Release\Binaries\Release - cd $(Build.ArtifactStagingDirectory)\${{ parameters.targetPlatform }}_Release\Binaries\Release + cd $(Build.ArtifactStagingDirectory)\${{ parameters.targetPlatform }}_Release\Release\Binaries .\test_runner.exe *test.dll displayName: 'Run tests, release'