This commit is contained in:
Matt Schulte 2019-04-02 12:49:57 -07:00
Родитель eccde5eaff
Коммит f055f04963
1 изменённых файлов: 20 добавлений и 22 удалений

Просмотреть файл

@ -72,17 +72,16 @@ jobs:
BuildGenerator: 'Ninja' BuildGenerator: 'Ninja'
CMakeConfiguration: 'relwithdebinfo' CMakeConfiguration: 'relwithdebinfo'
vmImage: 'windows-2019' vmImage: 'windows-2019'
# VS2019 msbuild generators blocked by issue Microsoft/azure-pipelines-image-generation#754 VS2019_x86_64-pc-windows-msvc_debug_msbuild:
# VS2019_x86_64-pc-windows-msvc_debug_msbuild: CMakeArch: 'amd64'
# CMakeArch: 'amd64' BuildGenerator: 'Visual Studio 16 2019'
# BuildGenerator: 'Visual Studio 16 2019' CMakeConfiguration: 'debug'
# CMakeConfiguration: 'debug' vmImage: 'windows-2019'
# vmImage: 'windows-2019' VS2019_x86_64-pc-windows-msvc_relwithdebinfo_msbuild:
# VS2019_x86_64-pc-windows-msvc_relwithdebinfo_msbuild: CMakeArch: 'amd64'
# CMakeArch: 'amd64' BuildGenerator: 'Visual Studio 16 2019'
# BuildGenerator: 'Visual Studio 16 2019' CMakeConfiguration: 'relwithdebinfo'
# CMakeConfiguration: 'relwithdebinfo' vmImage: 'windows-2019'
# vmImage: 'windows-2019'
VS2019_x86-pc-windows-msvc_debug_ninja: VS2019_x86-pc-windows-msvc_debug_ninja:
CMakeArch: 'x86' CMakeArch: 'x86'
BuildGenerator: 'Ninja' BuildGenerator: 'Ninja'
@ -93,17 +92,16 @@ jobs:
BuildGenerator: 'Ninja' BuildGenerator: 'Ninja'
CMakeConfiguration: 'relwithdebinfo' CMakeConfiguration: 'relwithdebinfo'
vmImage: 'windows-2019' vmImage: 'windows-2019'
# VS2019 msbuild generators blocked by issue Microsoft/azure-pipelines-image-generation#754 VS2019_x86-pc-windows-msvc_debug_msbuild:
# VS2019_x86-pc-windows-msvc_debug_msbuild: CMakeArch: 'x86'
# CMakeArch: 'x86' BuildGenerator: 'Visual Studio 16 2019'
# BuildGenerator: 'Visual Studio 16 2019' CMakeConfiguration: 'debug'
# CMakeConfiguration: 'debug' vmImage: 'windows-2019'
# vmImage: 'windows-2019' VS2019_x86-pc-windows-msvc_relwithdebinfo_msbuild:
# VS2019_x86-pc-windows-msvc_relwithdebinfo_msbuild: CMakeArch: 'x86'
# CMakeArch: 'x86' BuildGenerator: 'Visual Studio 16 2019'
# BuildGenerator: 'Visual Studio 16 2019' CMakeConfiguration: 'relwithdebinfo'
# CMakeConfiguration: 'relwithdebinfo' vmImage: 'windows-2019'
# vmImage: 'windows-2019'
pool: pool:
vmImage: $(vmImage) vmImage: $(vmImage)