From 9edbb71aaa031f638fa6866df9509a616fd9eb79 Mon Sep 17 00:00:00 2001 From: Bruno Lopes Date: Thu, 11 Dec 2025 19:01:50 -0300 Subject: [PATCH] gitlab-ci: Go back to upstream vcpkg repo https://github.com/microsoft/vcpkg/pull/48711 was merged --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5c652cefa2..9cd0c97228 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -561,7 +561,7 @@ gimp-snap: PKGCONF_RELOCATABLE_OPTION: '-Dpkgconfig.relocatable=true' before_script: - $GIMP_PREFIX = "$PWD\_install-$(if (-not $env:MSYSTEM_PREFIX) { $(((Get-WmiObject Win32_ComputerSystem).SystemType).Split('-')[0].Trim().ToLower()) } else { $env:MSYSTEM_PREFIX })" - - if ("$VARIANT" -eq '-msvc') { if (-not (Test-Path $env:VCPKG_ROOT)) { git clone --depth 1 --branch gitlab-gnome-remove https://github.com/BillyONeal/vcpkg; .\vcpkg\bootstrap-vcpkg.bat }; pip install meson } + - if ("$VARIANT" -eq '-msvc') { if (-not (Test-Path $env:VCPKG_ROOT)) { git clone --depth 1 https://github.com/microsoft/vcpkg; .\vcpkg\bootstrap-vcpkg.bat }; pip install meson } - if ("$VARIANT" -eq '-msvc') { $VSINSTALLDIR = $(vswhere -products * -latest -property installationPath); Import-Module "$VSINSTALLDIR\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"; Enter-VsDevShell -VsInstallPath "$VSINSTALLDIR" -SkipAutomaticLocation -DevCmdArguments "-arch=$(((Get-WmiObject Win32_ComputerSystem).SystemType).Split('-')[0].Trim().ToLower())" } timeout: 120m