TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-27 23:34:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

workflow: Build Windows using windows-2022 and Visual Studio 2022

Browse Source
This commit is contained in:
Daniel 2021-12-05 17:12:13 +02:00 committed by rdb
parent fc625eec11
commit 1f39c3333f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/ci.yml vendored
View File

@ -15,7 +15,7 @@ jobs:
- ubuntu-bionic-coverage-ninja - ubuntu-bionic-coverage-ninja
- macos-eigen-coverage-unity-xcode - macos-eigen-coverage-unity-xcode
- macos-nometa-standard-makefile - macos-nometa-standard-makefile
# - windows-standard-unity-msvc # FIXME when GH Actions runners upgrade CMake to >=3.16.1 - windows-standard-unity-msvc
- windows-nopython-nometa-standard-msvc - windows-nopython-nometa-standard-msvc
include: include:
@ -60,20 +60,20 @@ jobs:
eigen: NO eigen: NO
- profile: windows-standard-unity-msvc - profile: windows-standard-unity-msvc
os: windows-2019 os: windows-2022
config: Standard config: Standard
unity: YES unity: YES
generator: Visual Studio 16 2019 generator: Visual Studio 17 2022
compiler: Default compiler: Default
metalibs: YES metalibs: YES
python: YES python: YES
eigen: NO eigen: NO
- profile: windows-nopython-nometa-standard-msvc - profile: windows-nopython-nometa-standard-msvc
os: windows-2019 os: windows-2022
config: Standard config: Standard
unity: NO unity: NO
generator: Visual Studio 16 2019 generator: Visual Studio 17 2022
compiler: Default compiler: Default
metalibs: NO metalibs: NO
python: NO python: NO
@ -153,7 +153,7 @@ jobs:
cd build cd build
if ${{ matrix.compiler == 'Clang' }}; then if ${{ matrix.compiler == 'Clang' }}; then
if [[ "$CMAKE_GENERATOR" == *Studio*2019* ]]; then if [[ "$CMAKE_GENERATOR" =~ Studio.+20(19|22) ]]; then
export CMAKE_GENERATOR_TOOLSET=ClangCL export CMAKE_GENERATOR_TOOLSET=ClangCL
elif [[ "$CMAKE_GENERATOR" == *Studio* ]]; then elif [[ "$CMAKE_GENERATOR" == *Studio* ]]; then
export CMAKE_GENERATOR_TOOLSET=LLVM export CMAKE_GENERATOR_TOOLSET=LLVM