From 09ca7b3d9e88f7d90695ea243ffcb2014885edb7 Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Wed, 20 Dec 2023 04:39:32 +0800 Subject: [PATCH] ci/msvc: update flex and bison to winflexbison3 winflexbison3 is from github and faster, other than that, bison in winflexbison is too old(year 2007) Signed-off-by: Yonggang Luo Reviewed-by: Jesse Natalie Part-of: --- .gitlab-ci/windows/mesa_deps_choco.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/windows/mesa_deps_choco.ps1 b/.gitlab-ci/windows/mesa_deps_choco.ps1 index 58b052c387e..2a7df22f596 100644 --- a/.gitlab-ci/windows/mesa_deps_choco.ps1 +++ b/.gitlab-ci/windows/mesa_deps_choco.ps1 @@ -17,12 +17,12 @@ Import-Module "$env:ProgramData\chocolatey\helpers\chocolateyProfile.psm1" Update-SessionEnvironment Write-Host "Installing Chocolatey packages" -# Chocolatey tries to download winflexbison from SourceForge, which is not super reliable, and has no retry +# Chocolatey tries to download winflexbison3 from github, which is not super reliable, and has no retry # loop of its own - so we give it a helping hand here For ($i = 0; $i -lt 5; $i++) { choco install --no-progress -y python3 --params="/InstallDir:C:\python3" $python_install = $? - choco install --allow-empty-checksums --no-progress -y cmake git git-lfs ninja pkgconfiglite winflexbison --installargs "ADD_CMAKE_TO_PATH=System" + choco install --allow-empty-checksums --no-progress -y cmake git git-lfs ninja pkgconfiglite winflexbison3 --installargs "ADD_CMAKE_TO_PATH=System" $other_install = $? $choco_installed = $other_install -and $python_install if ($choco_installed) {