Skip to content

Commit

Permalink
ci: update Visual Studio
Browse files Browse the repository at this point in the history
  • Loading branch information
zyzniewski committed Dec 29, 2022
1 parent 1a5e31d commit 689f9ec
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/actions/build-plugin/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ inputs:
visualStudio:
description: 'Visual Studio version (Windows only)'
required: false
default: 'Visual Studio 16 2019'
default: 'Visual Studio 17 2022'
workingDirectory:
description: 'Working directory for packaging'
required: false
Expand Down
4 changes: 2 additions & 2 deletions .github/scripts/Build-Windows.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ param(
[ValidateSet('x86', 'x64')]
[string] $Target,
[ValidateSet('Visual Studio 17 2022', 'Visual Studio 16 2019')]
[string] $CMakeGenerator = 'Visual Studio 16 2019'
[string] $CMakeGenerator = 'Visual Studio 17 2022'
)

$ErrorActionPreference = 'Stop'
Expand Down Expand Up @@ -56,7 +56,7 @@ function Build {

$CmakeArgs = @(
'-G', $CmakeGenerator
'-DCMAKE_SYSTEM_VERSION=10.0.18363.657'
'-DCMAKE_SYSTEM_VERSION=10.0.20348.0'
"-DCMAKE_GENERATOR_PLATFORM=$(if (${script:Target} -eq "x86") { "Win32" } else { "x64" })"
"-DCMAKE_BUILD_TYPE=${Configuration}"
"-DCMAKE_PREFIX_PATH=$(Resolve-Path -Path "${ProjectRoot}/../obs-build-dependencies/plugin-deps-${Target}")"
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/utils.pwsh/Setup-Obs.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ function Setup-Obs {

$CmakeArgs = @(
'-G', $script:CmakeGenerator
'-DCMAKE_SYSTEM_VERSION=10.0.18363.657'
'-DCMAKE_SYSTEM_VERSION=10.0.20348.0'
"-DCMAKE_GENERATOR_PLATFORM=$(if (${script:Target} -eq "x86") { "Win32" } else { "x64" })"
"-DCMAKE_BUILD_TYPE=${script:Configuration}"
'-DENABLE_PLUGINS=OFF'
Expand Down

0 comments on commit 689f9ec

Please sign in to comment.