diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2020-04-28 20:25:01 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-04-28 20:25:01 +0000 |
commit | f002a932f499e1c11e5a937e6646423aef73ebbf (patch) | |
tree | 051e6a6105b6a9e535a4373f30b8e3736310b78e /appveyor.yml | |
parent | d376f3d2c1c30ea8725b903d353492d944a83858 (diff) | |
parent | d4e54c121f49d73c9e18aff087ce3dbafc2eab47 (diff) | |
download | Microsoft-GSL-android12-mainline-tzdata-release.tar.gz |
Snap for 6439596 from d4e54c121f49d73c9e18aff087ce3dbafc2eab47 to qt-aml-tzdata-releaseq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11q_tzdata_aml_297100000android12-mainline-tzdata-releaseandroid10-mainline-tzdata-releaseandroid10-android13-mainline-tzdata-release
Change-Id: I03b1f10ec97bc793f9d8ff2a42be57d98cb14770
Diffstat (limited to 'appveyor.yml')
-rw-r--r-- | appveyor.yml | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/appveyor.yml b/appveyor.yml index 6feaf7c..c3e3c87 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,7 +11,6 @@ configuration: image: - Visual Studio 2015 - Visual Studio 2017 - - Visual Studio 2019 environment: NINJA_TAG: v1.8.2 @@ -19,7 +18,6 @@ environment: NINJA_PATH: C:\Tools\ninja\ninja-%NINJA_TAG% VCVAR2015: 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat' VCVAR2017: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat' - VCVAR2019: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat' matrix: - GSL_CXX_STANDARD: 14 USE_TOOLSET: MSVC @@ -43,7 +41,7 @@ matrix: USE_GENERATOR: MSBuild cache: - - C:\cmake-3.14.4-win32-x86 + - C:\cmake-3.8.0-win32-x86 - C:\Tools\ninja install: @@ -60,11 +58,11 @@ install: $env:PATH = "$env:NINJA_PATH;$env:PATH" } else { Write-Warning "Failed to find ninja.exe in expected location." } if ($env:USE_TOOLSET -ne "LLVM") { - if (![IO.File]::Exists("C:\cmake-3.14.0-win32-x86\bin\cmake.exe")) { - Start-FileDownload 'https://cmake.org/files/v3.14/cmake-3.14.4-win32-x86.zip' - 7z x -y -bso0 cmake-3.14.4-win32-x86.zip -oC:\ + if (![IO.File]::Exists("C:\cmake-3.8.0-win32-x86\bin\cmake.exe")) { + Start-FileDownload 'https://cmake.org/files/v3.8/cmake-3.8.0-win32-x86.zip' + 7z x -y -bso0 cmake-3.8.0-win32-x86.zip -oC:\ } - $env:PATH="C:\cmake-3.14.4-win32-x86\bin;$env:PATH" + $env:PATH="C:\cmake-3.8.0-win32-x86\bin;$env:PATH" } before_build: @@ -74,20 +72,16 @@ before_build: $Architecture = $env:PLATFORM if ("$env:APPVEYOR_BUILD_WORKER_IMAGE" -eq "Visual Studio 2015") { $env:VCVARSALL = "`"$env:VCVAR2015`" $Architecture" - } elseif ("$env:APPVEYOR_BUILD_WORKER_IMAGE" -eq "Visual Studio 2017") { - $env:VCVARSALL = "`"$env:VCVAR2017`" $Architecture" } else { - $env:VCVARSALL = "`"$env:VCVAR2019`" $Architecture" + $env:VCVARSALL = "`"$env:VCVAR2017`" $Architecture" } $env:CMakeGenFlags = "-G Ninja -DGSL_CXX_STANDARD=$env:GSL_CXX_STANDARD" } else { $GeneratorFlags = '/m /v:minimal' if ("$env:APPVEYOR_BUILD_WORKER_IMAGE" -eq "Visual Studio 2015") { $Generator = 'Visual Studio 14 2015' - } elseif ("$env:APPVEYOR_BUILD_WORKER_IMAGE" -eq "Visual Studio 2017") { - $Generator = 'Visual Studio 15 2017' } else { - $Generator = 'Visual Studio 16 2019' + $Generator = 'Visual Studio 15 2017' } if ("$env:PLATFORM" -eq "x86") { $Architecture = "Win32" |