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 #9176 from Icinga/feature/github-actions-windows-preinstalled-deps-2.13

Browse Source 
GitHub Actions: Use preinstalled dependencies on Windows (2.13)
This commit is contained in:
Alexander Aleksandrovič Klimov 2022-01-17 12:19:16 +01:00 committed by GitHub
commit d416aa97ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
doc/win-dev.ps1
View File

@ -70,43 +70,26 @@ try {
$Env:Path += $ChocoPath $Env:Path += $ChocoPath
} }
# GitHub Actions uses an image that comes with most dependencies preinstalled. Don't install them twice.
choco install -y "visualstudio${VsVersion}community" if (-not $Env:GITHUB_ACTIONS) {
ThrowOnNativeFailure choco install -y `
"visualstudio${VsVersion}community" `
choco install -y "visualstudio${VsVersion}-workload-netcoretools" "visualstudio${VsVersion}-workload-netcoretools" `
ThrowOnNativeFailure "visualstudio${VsVersion}-workload-vctools" `
"visualstudio${VsVersion}-workload-manageddesktop" `
choco install -y "visualstudio${VsVersion}-workload-vctools" "visualstudio${VsVersion}-workload-nativedesktop" `
ThrowOnNativeFailure "visualstudio${VsVersion}-workload-universal" `
"visualstudio${VsVersion}buildtools" `
choco install -y "visualstudio${VsVersion}-workload-manageddesktop" git `
ThrowOnNativeFailure cmake `
winflexbison3 `
choco install -y "visualstudio${VsVersion}-workload-nativedesktop" windows-sdk-8.1 `
ThrowOnNativeFailure wixtoolset
ThrowOnNativeFailure
choco install -y "visualstudio${VsVersion}-workload-universal" } else {
ThrowOnNativeFailure choco install -y winflexbison3
ThrowOnNativeFailure
choco install -y "visualstudio${VsVersion}buildtools" }
ThrowOnNativeFailure
choco install -y git
ThrowOnNativeFailure
choco install -y cmake
ThrowOnNativeFailure
choco install -y winflexbison3
ThrowOnNativeFailure
choco install -y windows-sdk-8.1
ThrowOnNativeFailure
choco install -y wixtoolset
ThrowOnNativeFailure
Install-Exe -Url "https://packages.icinga.com/windows/dependencies/boost_$($BoostVersion -join '_')-msvc-${MsvcVersion}-${Env:BITS}.exe" -Dir "C:\local\boost_$($BoostVersion -join '_')-Win${Env:BITS}" Install-Exe -Url "https://packages.icinga.com/windows/dependencies/boost_$($BoostVersion -join '_')-msvc-${MsvcVersion}-${Env:BITS}.exe" -Dir "C:\local\boost_$($BoostVersion -join '_')-Win${Env:BITS}"

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

@ -29,8 +29,9 @@ if (Test-Path env:BITS) {
# Execute vcvars in cmd and store env # Execute vcvars in cmd and store env
$vcvars_locations = @( $vcvars_locations = @(
"${VSBASE}\BuildTools\VC\Auxiliary\Build\vcvars${bits}.bat", "${VSBASE}\BuildTools\VC\Auxiliary\Build\vcvars${bits}.bat"
"${VSBASE}\Community\VC\Auxiliary\Build\vcvars${bits}.bat" "${VSBASE}\Community\VC\Auxiliary\Build\vcvars${bits}.bat"
"${VSBASE}\Enterprise\VC\Auxiliary\Build\vcvars${bits}.bat"
) )
$vcvars = $null $vcvars = $null