From ec2c6dd8ea8ec8f9be70c1a8b1d208f5bbfe1f68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Tue, 6 Jun 2023 10:10:03 +0200 Subject: [PATCH] ci: install vcredist2022 as 2019 has been removed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See this PR for details: https://github.com/ScoopInstaller/Extras/pull/11357 Also check if `exras` bucket already exists. Signed-off-by: Jakub SokoĊ‚owski --- scripts/windows_build_setup.ps1 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/windows_build_setup.ps1 b/scripts/windows_build_setup.ps1 index 3dd5a656cd..3906aa52b9 100644 --- a/scripts/windows_build_setup.ps1 +++ b/scripts/windows_build_setup.ps1 @@ -15,13 +15,15 @@ function Install-Scoop { # Install Git and other dependencies function Install-Dependencies { Write-Host "Installing dependencies..." + if (!(scoop bucket list | Where { $_.Name -eq "extras" })) { + scoop bucket add extras + } scoop install --global go@1.20.4 + scoop install --global vcredist2022 scoop install --global ` 7zip git dos2unix findutils ` wget rcedit inno-setup ` make cmake gcc - scoop bucket add extras - scoop install --global vcredist2019 } function Install-Qt-SDK { @@ -68,7 +70,7 @@ export VCINSTALLDIR="/c/BuildTools/VC" You might also have to include the following paths in your `$PATH: export PATH=`"/c/BuildTools/MSBuild/Current/Bin:`$PATH`" -export PATH=`"/c/BuildTools/VC/Tools/MSVC/14.27.29110/bin:`$PATH`" +export PATH=`"/c/BuildTools/VC/Tools/MSVC/14.29.30133/bin:`$PATH`" export PATH=`"/c/ProgramData/scoop/apps/inno-setup/current:`$PATH`" "@ }