tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-27 07:34:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9747 from Icinga/vs2022

Browse Source 
GHA: Windows: upgrade to VS 2022
This commit is contained in:
Julian Brost 2025-06-17 10:07:30 +02:00 committed by GitHub
commit 3c9b4693a9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/windows.yml vendored
View File

@ -21,7 +21,7 @@ jobs:
matrix: matrix:
bits: [32, 64] bits: [32, 64]
runs-on: windows-2019 runs-on: windows-2025
env: env:
BITS: '${{ matrix.bits }}' BITS: '${{ matrix.bits }}'

6
doc/win-dev.ps1
View File

@ -11,8 +11,8 @@ function ThrowOnNativeFailure {
} }
$VsVersion = 2019 $VsVersion = 2022
$MsvcVersion = '14.2' $MsvcVersion = '14.3'
$BoostVersion = @(1, 88, 0) $BoostVersion = @(1, 88, 0)
$OpensslVersion = '3_0_16' $OpensslVersion = '3_0_16'
@ -74,7 +74,6 @@ try {
if (-not $Env:GITHUB_ACTIONS) { if (-not $Env:GITHUB_ACTIONS) {
choco install -y ` choco install -y `
"visualstudio${VsVersion}community" ` "visualstudio${VsVersion}community" `
"visualstudio${VsVersion}-workload-netcoretools" `
"visualstudio${VsVersion}-workload-vctools" ` "visualstudio${VsVersion}-workload-vctools" `
"visualstudio${VsVersion}-workload-manageddesktop" ` "visualstudio${VsVersion}-workload-manageddesktop" `
"visualstudio${VsVersion}-workload-nativedesktop" ` "visualstudio${VsVersion}-workload-nativedesktop" `
@ -83,6 +82,7 @@ if (-not $Env:GITHUB_ACTIONS) {
git ` git `
cmake ` cmake `
winflexbison3 ` winflexbison3 `
netfx-4.6-devpack `
windows-sdk-8.1 ` windows-sdk-8.1 `
wixtoolset wixtoolset
ThrowOnNativeFailure ThrowOnNativeFailure

6
tools/win32/configure-dev.ps1
View File

@ -1,6 +1,6 @@
Set-PsDebug -Trace 1 Set-PsDebug -Trace 1
# Specify default targets for VS 2019 for developers. # Specify default targets for VS 2022 for developers.
if (-not (Test-Path env:ICINGA2_BUILDPATH)) { if (-not (Test-Path env:ICINGA2_BUILDPATH)) {
$env:ICINGA2_BUILDPATH = '.\debug' $env:ICINGA2_BUILDPATH = '.\debug'
@ -22,7 +22,7 @@ if (-not ($env:PATH -contains $env:CMAKE_PATH)) {
$env:PATH = $env:CMAKE_PATH + ';' + $env:PATH $env:PATH = $env:CMAKE_PATH + ';' + $env:PATH
} }
if (-not (Test-Path env:CMAKE_GENERATOR)) { if (-not (Test-Path env:CMAKE_GENERATOR)) {
$env:CMAKE_GENERATOR = 'Visual Studio 16 2019' $env:CMAKE_GENERATOR = 'Visual Studio 17 2022'
} }
if (-not (Test-Path env:CMAKE_GENERATOR_PLATFORM)) { if (-not (Test-Path env:CMAKE_GENERATOR_PLATFORM)) {
$env:CMAKE_GENERATOR_PLATFORM = 'x64' $env:CMAKE_GENERATOR_PLATFORM = 'x64'
@ -37,7 +37,7 @@ if (-not (Test-Path env:BOOST_ROOT)) {
$env:BOOST_ROOT = 'c:\local\boost_1_88_0' $env:BOOST_ROOT = 'c:\local\boost_1_88_0'
} }
if (-not (Test-Path env:BOOST_LIBRARYDIR)) { if (-not (Test-Path env:BOOST_LIBRARYDIR)) {
$env:BOOST_LIBRARYDIR = 'c:\local\boost_1_88_0\lib64-msvc-14.2' $env:BOOST_LIBRARYDIR = 'c:\local\boost_1_88_0\lib64-msvc-14.3'
} }
if (-not (Test-Path env:FLEX_BINARY)) { if (-not (Test-Path env:FLEX_BINARY)) {
$env:FLEX_BINARY = 'C:\ProgramData\chocolatey\bin\win_flex.exe' $env:FLEX_BINARY = 'C:\ProgramData\chocolatey\bin\win_flex.exe'

4
tools/win32/configure.ps1
View File

@ -17,7 +17,7 @@ if (-not ($env:PATH -contains $env:CMAKE_PATH)) {
$env:PATH = $env:CMAKE_PATH + ';' + $env:PATH $env:PATH = $env:CMAKE_PATH + ';' + $env:PATH
} }
if (-not (Test-Path env:CMAKE_GENERATOR)) { if (-not (Test-Path env:CMAKE_GENERATOR)) {
$env:CMAKE_GENERATOR = 'Visual Studio 16 2019' $env:CMAKE_GENERATOR = 'Visual Studio 17 2022'
} }
if (-not (Test-Path env:BITS)) { if (-not (Test-Path env:BITS)) {
$env:BITS = 64 $env:BITS = 64
@ -39,7 +39,7 @@ if (-not (Test-Path env:BOOST_ROOT)) {
$env:BOOST_ROOT = "c:\local\boost_1_88_0-Win${env:BITS}" $env:BOOST_ROOT = "c:\local\boost_1_88_0-Win${env:BITS}"
} }
if (-not (Test-Path env:BOOST_LIBRARYDIR)) { if (-not (Test-Path env:BOOST_LIBRARYDIR)) {
$env:BOOST_LIBRARYDIR = "c:\local\boost_1_88_0-Win${env:BITS}\lib${env:BITS}-msvc-14.2" $env:BOOST_LIBRARYDIR = "c:\local\boost_1_88_0-Win${env:BITS}\lib${env:BITS}-msvc-14.3"
} }
if (-not (Test-Path env:FLEX_BINARY)) { if (-not (Test-Path env:FLEX_BINARY)) {
$env:FLEX_BINARY = 'C:\ProgramData\chocolatey\bin\win_flex.exe' $env:FLEX_BINARY = 'C:\ProgramData\chocolatey\bin\win_flex.exe'

2
tools/win32/load-vsenv.ps1
View File

@ -18,7 +18,7 @@ if (-not (Test-Path $BUILD)) {
if (Test-Path env:VS_INSTALL_PATH) { if (Test-Path env:VS_INSTALL_PATH) {
$VSBASE = $env:VS_INSTALL_PATH $VSBASE = $env:VS_INSTALL_PATH
} else { } else {
$VSBASE = "C:\Program Files (x86)\Microsoft Visual Studio\2019" $VSBASE = "C:\Program Files\Microsoft Visual Studio\2022"
} }
if (Test-Path env:BITS) { if (Test-Path env:BITS) {