From e4bdf9e0cb59994844a313068549507d610172c0 Mon Sep 17 00:00:00 2001 From: Adam Retter Date: Mon, 11 Jan 2021 13:31:03 -0800 Subject: [PATCH] Small improvements to CircleCI Windows jobs (#7852) Summary: * Clearer indication of which versions of msbuild and Visual Studio is used * Explicit naming of the build jobs within the Windows workflows Pull Request resolved: https://github.com/facebook/rocksdb/pull/7852 Reviewed By: akankshamahajan15 Differential Revision: D25864444 Pulled By: jay-zhuang fbshipit-source-id: 0d618ad8a8892d5a2575cdfaa59d61a989c4df4b --- .circleci/config.yml | 23 ++++++++++++++++------- .circleci/vs2015_install.ps1 | 1 + .circleci/vs2017_install.ps1 | 1 + 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7d76991a8..3594be83c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -364,9 +364,13 @@ jobs: - run: name: "Setup VS" command: | - if [[ "${VS_YEAR}" == "2017" ]]; then + if [[ "${VS_YEAR}" == "2019" ]]; then + echo "VS2019 already present." + elif [[ "${VS_YEAR}" == "2017" ]]; then + echo "Installing VS2017..." powershell .circleci/vs2017_install.ps1 elif [[ "${VS_YEAR}" == "2015" ]]; then + echo "Installing VS2015..." powershell .circleci/vs2015_install.ps1 fi - run: @@ -392,6 +396,7 @@ jobs: cd build ${CMAKE_BIN} -G "${CMAKE_GENERATOR}" -DCMAKE_BUILD_TYPE=Debug -DOPTDBG=1 -DPORTABLE=1 -DSNAPPY=1 -DJNI=1 << parameters.extra_cmake_opt >> .. cd .. + echo "Building with VS version: ${CMAKE_GENERATOR}" msbuild.exe build/rocksdb.sln -maxCpuCount -property:Configuration=Debug -property:Platform=x64 - run: name: "Test RocksDB" @@ -600,23 +605,27 @@ workflows: build-linux-unity: jobs: - build-linux-unity - build-windows: + build-windows-vs2019: + jobs: + - build-windows: + name: "build-windows-vs2019" + build-windows-vs2019-cxx20: jobs: - - build-windows + - build-windows: + name: "build-windows-vs2019-cxx20" + extra_cmake_opt: -DCMAKE_CXX_STANDARD=20 build-windows-vs2017: jobs: - build-windows: + name: "build-windows-vs2017" vs_year: "2017" cmake_generator: "Visual Studio 15 Win64" build-windows-vs2015: jobs: - build-windows: + name: "build-windows-vs2015" vs_year: "2015" cmake_generator: "Visual Studio 14 Win64" - build-windows-cxx20: - jobs: - - build-windows: - extra_cmake_opt: -DCMAKE_CXX_STANDARD=20 build-java: jobs: - build-linux-java diff --git a/.circleci/vs2015_install.ps1 b/.circleci/vs2015_install.ps1 index 54c9f9d6f..754af0e57 100644 --- a/.circleci/vs2015_install.ps1 +++ b/.circleci/vs2015_install.ps1 @@ -21,3 +21,4 @@ if (($exitCode -ne 0) -and ($exitCode -ne 3010)) { Copy-Item -Path "C:\Users\circleci\AppData\Local\Temp\vslogs.zip" -Destination "C:\w\build-results\" exit 1 } +echo "VS 2015 installed." diff --git a/.circleci/vs2017_install.ps1 b/.circleci/vs2017_install.ps1 index 25ab90b2e..93975fff4 100644 --- a/.circleci/vs2017_install.ps1 +++ b/.circleci/vs2017_install.ps1 @@ -32,3 +32,4 @@ if (($exitCode -ne 0) -and ($exitCode -ne 3010)) { Copy-Item -Path "C:\Users\circleci\AppData\Local\Temp\vslogs.zip" -Destination "C:\w\build-results\" exit 1 } +echo "VS 2017 installed."