From 8d919785887739ed508ce5f4dfd4c8db6f8c1649 Mon Sep 17 00:00:00 2001 From: Luc Touraille Date: Wed, 7 Jan 2026 19:07:19 +0100 Subject: [PATCH 1/2] [vcpkg_from_git] Unshallow when fetching FETCH_REF Fixes #49281. --- scripts/cmake/vcpkg_from_git.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_from_git.cmake b/scripts/cmake/vcpkg_from_git.cmake index 1768abc1d70791..0f62ed42495603 100644 --- a/scripts/cmake/vcpkg_from_git.cmake +++ b/scripts/cmake/vcpkg_from_git.cmake @@ -55,7 +55,7 @@ function(vcpkg_from_git) if(DEFINED arg_FETCH_REF) set(ref_to_fetch "${arg_FETCH_REF}") - vcpkg_list(SET git_fetch_shallow_param) + vcpkg_list(SET git_fetch_shallow_param --unshallow) else() set(ref_to_fetch "${arg_REF}") endif() From c3627eb4e831fc2a4ece31ee42b8a72e3d08f3dc Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Thu, 8 Jan 2026 15:50:49 -0800 Subject: [PATCH 2/2] Baseline update --- scripts/ci.baseline.txt | 14 ++++++++++++++ scripts/ci.feature.baseline.txt | 1 + 2 files changed, 15 insertions(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 66956ac9e799f8..c52cf9fac806a5 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -644,6 +644,20 @@ spaceland:x64-uwp=fail spscqueue:arm-neon-android=fail spscqueue:arm64-android=fail spscqueue:x64-android=fail +stlab-enum-ops:arm-neon-android=skip # conflicts with stlab +stlab-enum-ops:arm64-android=skip # conflicts with stlab +stlab-enum-ops:arm64-osx=skip # conflicts with stlab +stlab-enum-ops:arm64-uwp=skip # conflicts with stlab +stlab-enum-ops:arm64-windows-static-md=skip # conflicts with stlab +stlab-enum-ops:arm64-windows=skip # conflicts with stlab +stlab-enum-ops:x64-android=skip # conflicts with stlab +stlab-enum-ops:x64-linux=skip # conflicts with stlab +stlab-enum-ops:x64-uwp=skip # conflicts with stlab +stlab-enum-ops:x64-windows-release=skip # conflicts with stlab +stlab-enum-ops:x64-windows-static-md=skip # conflicts with stlab +stlab-enum-ops:x64-windows-static=skip # conflicts with stlab +stlab-enum-ops:x64-windows=skip # conflicts with stlab +stlab-enum-ops:x86-windows=skip # conflicts with stlab # sqlpp11-connector-mysql: CI issues resolved by overlay port stormlib:arm64-uwp=fail stormlib:x64-uwp=fail diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index d6474f8456e24a..0a20c58eefff30 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -1843,6 +1843,7 @@ qtbase[xcb,xcb-sm,xcb-xlib,xkb,xkbcommon-x11,xlib,xrender](windows) = skip # no qtvirtualkeyboard[t9write] = skip # depends on the port 't9write' that does not exists qtwebengine = skip # Takes too long to feature test at ~3 hours per feature s2n = skip # builds too slow +stlab-enum-ops = skip # conflicts with stlab usd=skip # USD has set official policy that they will not update to be compatible with TBB in the near term (https://github.com/PixarAnimationStudios/USD/issues/1600) vtk[ioocct](!uwp) = skip vtk-m[cuda]:x64-linux = skip # CUDA clash with default gcc in Ubuntu 22.04, and not a quick failure.