andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Small improvements to CircleCI Windows jobs (#7852)

Browse Source 
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
This commit is contained in:
Adam Retter 2021-01-11 13:31:03 -08:00 committed by Facebook GitHub Bot
parent edfcce39da
commit e4bdf9e0cb
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.circleci/config.yml
View File

@ -364,9 +364,13 @@ jobs:
- run: - run:
name: "Setup VS" name: "Setup VS"
command: | 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 powershell .circleci/vs2017_install.ps1
elif [[ "${VS_YEAR}" == "2015" ]]; then elif [[ "${VS_YEAR}" == "2015" ]]; then
echo "Installing VS2015..."
powershell .circleci/vs2015_install.ps1 powershell .circleci/vs2015_install.ps1
fi fi
- run: - run:
@ -392,6 +396,7 @@ jobs:
cd build cd build
${CMAKE_BIN} -G "${CMAKE_GENERATOR}" -DCMAKE_BUILD_TYPE=Debug -DOPTDBG=1 -DPORTABLE=1 -DSNAPPY=1 -DJNI=1 << parameters.extra_cmake_opt >> .. ${CMAKE_BIN} -G "${CMAKE_GENERATOR}" -DCMAKE_BUILD_TYPE=Debug -DOPTDBG=1 -DPORTABLE=1 -DSNAPPY=1 -DJNI=1 << parameters.extra_cmake_opt >> ..
cd .. cd ..
echo "Building with VS version: ${CMAKE_GENERATOR}"
msbuild.exe build/rocksdb.sln -maxCpuCount -property:Configuration=Debug -property:Platform=x64 msbuild.exe build/rocksdb.sln -maxCpuCount -property:Configuration=Debug -property:Platform=x64
- run: - run:
name: "Test RocksDB" name: "Test RocksDB"
@ -600,23 +605,27 @@ workflows:
build-linux-unity: build-linux-unity:
jobs: jobs:
- build-linux-unity - build-linux-unity
build-windows: build-windows-vs2019:
jobs: jobs:
- build-windows - build-windows:
name: "build-windows-vs2019"
build-windows-vs2019-cxx20:
jobs:
- build-windows:
name: "build-windows-vs2019-cxx20"
extra_cmake_opt: -DCMAKE_CXX_STANDARD=20
build-windows-vs2017: build-windows-vs2017:
jobs: jobs:
- build-windows: - build-windows:
name: "build-windows-vs2017"
vs_year: "2017" vs_year: "2017"
cmake_generator: "Visual Studio 15 Win64" cmake_generator: "Visual Studio 15 Win64"
build-windows-vs2015: build-windows-vs2015:
jobs: jobs:
- build-windows: - build-windows:
name: "build-windows-vs2015"
vs_year: "2015" vs_year: "2015"
cmake_generator: "Visual Studio 14 Win64" cmake_generator: "Visual Studio 14 Win64"
build-windows-cxx20:
jobs:
- build-windows:
extra_cmake_opt: -DCMAKE_CXX_STANDARD=20
build-java: build-java:
jobs: jobs:
- build-linux-java - build-linux-java

1
.circleci/vs2015_install.ps1
View File

@ -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\" Copy-Item -Path "C:\Users\circleci\AppData\Local\Temp\vslogs.zip" -Destination "C:\w\build-results\"
exit 1 exit 1
} }
echo "VS 2015 installed."

1
.circleci/vs2017_install.ps1
View File

@ -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\" Copy-Item -Path "C:\Users\circleci\AppData\Local\Temp\vslogs.zip" -Destination "C:\w\build-results\"
exit 1 exit 1
} }
echo "VS 2017 installed."