From ee2e8e89a96e481f4ce219eb229ed0521f5209ea Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 21 May 2025 18:32:11 -0700 Subject: [PATCH] Update vcpkg-tool to 2025-05-19. (#45592) --- .../azure-pipelines/test-modified-ports.ps1 | 11 ++-- scripts/ci.feature.baseline.txt | 56 ------------------- scripts/vcpkg-tool-metadata.txt | 12 ++-- 3 files changed, 10 insertions(+), 69 deletions(-) diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index 227b4444fd..ff2d8222b1 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -149,14 +149,11 @@ if ($testFeatures) { if ($lastLastExitCode -ne 0) { Write-Host "##vso[task.setvariable variable=FAILURE_LOGS_EMPTY]$false" - Write-Host "##vso[task.logissue type=warning]vcpkg feature testing failed; this is usually a bug in one of the features in the port(s) edited in this pull request. Check for failure logs attached to the run in Azure Pipelines." - Write-Host "This is not a fatal error for now while we improve the x-test-features experience, but you may wish to check the feature test results." - # exit $lastLastExitCode - } - else - { - $knownFailuresFromArgs += "--known-failures-from=$knownFailingAbisFile" + Write-Error "vcpkg feature testing failed; this is usually a bug in one of the features in the port(s) edited in this pull request. Check for failure logs attached to the run in Azure Pipelines." + exit $lastLastExitCode } + + $knownFailuresFromArgs += "--known-failures-from=$knownFailingAbisFile" } $ciBaselineFile = "$PSScriptRoot/../ci.baseline.txt" diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index fbe953389d..1e0b2d1e51 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -144,7 +144,6 @@ graphicsmagick(uwp)=fail graphqlparser:arm64-osx=fail # python2 required gsoap = skip # gsoap does not offer stable public source downloads gtk:x64-windows-static=fail -halide:x64-windows-static=fail hpx:arm64-windows=fail hpx:x64-windows-static=fail hunspell:x64-windows-static-md=fail @@ -260,8 +259,6 @@ libusbmuxd:x64-osx=fail libusbmuxd:x64-uwp=fail libuv:arm-uwp=fail libuv:x64-uwp=fail -libvmdk:arm-uwp=fail -libvmdk:x64-uwp=fail libvmdk=skip #Skip detection to avoid upstream remove older releases libwandio:arm-uwp=fail libwandio:arm64-windows=fail @@ -299,7 +296,6 @@ marble:x86-windows=fail mathgl:arm-uwp=fail mathgl:x64-uwp=fail mesa:x64-linux=fail # Missing dependent libraries. -mesa:x64-osx=fail # Missing dependent libraries. mesa:x64-windows-static=fail # Due to static crt. milerius-sfml-imgui:x64-windows-static=fail minifb:arm-uwp=fail @@ -322,12 +318,6 @@ moos-essential:arm64-windows=fail moos-essential:x64-windows-static-md=fail moos-essential:x64-windows=fail moos-essential:x86-windows=fail -ms-quic:arm-uwp=fail -ms-quic:arm64-windows=fail -ms-quic:x64-uwp=fail -ms-quic:x64-windows-static-md=fail -ms-quic:x64-windows=fail -ms-quic:x86-windows=fail msmpi:arm-uwp=fail msmpi:arm64-windows=fail msmpi:x64-linux=fail @@ -555,10 +545,7 @@ usbmuxd:x64-windows-static-md=fail 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) uthenticode:arm-uwp=fail uthenticode:x64-uwp=fail -v8:arm-uwp=fail -v8:arm64-windows=fail v8:x64-osx=fail -v8:x64-uwp=fail v8(windows)=fail # the version of v8 we have in the repo doesn't support VS2022 vectorclass:arm-uwp=fail vectorclass:arm64-windows=fail @@ -573,7 +560,6 @@ x265:arm64-windows=fail x265:x64-uwp=fail xalan-c:arm64-windows=fail xalan-c:x64-windows-static=fail -xbitmaps:x64-osx=skip # No xorg-macros available on osx xerces-c:arm-uwp=fail xerces-c:x64-uwp=fail xmlsec:arm-uwp=fail @@ -688,7 +674,6 @@ bitserializer-rapidyaml:arm64-windows = cascade bitserializer-rapidyaml:x64-uwp = cascade bloomberg-quantum:x64-uwp = cascade bond:arm64-uwp = cascade -bond:x64-uwp = cascade boost[mpi]:arm64-uwp = cascade boost[mpi]:arm64-windows = cascade boost[mpi]:x64-uwp = cascade @@ -706,12 +691,6 @@ boost-property-map-parallel:x86-windows = cascade boost-python[python2](osx) = cascade boost-regex[icu]:arm64-uwp = cascade boost-regex[icu]:x64-uwp = cascade -caffe2:arm64-uwp = cascade -caffe2:arm64-windows = cascade -caffe2:x64-uwp = cascade -caffe2:x64-windows-static = cascade -caffe2:x64-windows-static-md = cascade -caffe2:x86-windows = cascade caffe2(osx) = cascade cairo[fontconfig,gobject]:arm64-uwp = cascade cairo[fontconfig,gobject]:x64-uwp = cascade @@ -766,7 +745,6 @@ cppkafka:arm64-uwp = cascade cppkafka:x64-uwp = cascade cppzmq:arm64-uwp = cascade cppzmq:x64-uwp = cascade -crashrpt:x64-windows-static = cascade cub(!((windows & x64 & !uwp) | (linux & x64) | (linux & arm64))) = cascade cuda-api-wrappers(uwp | osx) = cascade curl[mbedtls,wolfssl]:arm64-uwp = cascade @@ -829,8 +807,6 @@ etcd-cpp-apiv3:x64-uwp = cascade evpp:arm64-uwp = cascade evpp:x64-uwp = cascade faiss[gpu]:arm64-windows = cascade -fastrtps:arm64-uwp = cascade -fastrtps:x64-uwp = cascade fbgemm:arm64-osx = cascade fbgemm:arm64-windows = cascade fbthrift(android) = cascade @@ -872,10 +848,6 @@ folly[liburing]:x64-windows-static = cascade folly[liburing]:x64-windows-static-md = cascade font-util:arm64-uwp = cascade font-util:x64-uwp = cascade -fontconfig:arm64-uwp = cascade -fontconfig:x64-uwp = cascade -freeglut:arm64-uwp = cascade -freeglut:x64-uwp = cascade freeimage:arm64-uwp = cascade freeimage:x64-uwp = cascade freeopcua:arm64-uwp = cascade @@ -883,8 +855,6 @@ freeopcua:x64-uwp = cascade freetds:x86-windows = cascade freetype-gl:arm64-uwp = cascade freetype-gl:x64-uwp = cascade -ftgl:arm64-uwp = cascade -ftgl:x64-uwp = cascade g2o:x64-uwp = cascade gamedev-framework:x64-uwp = cascade games101-cgl:arm64-uwp = cascade @@ -932,7 +902,6 @@ gmsh[mpi]:x64-windows-static = cascade gmsh[mpi]:x64-windows-static-md = cascade gmsh[mpi,occ]:x86-windows = cascade gobject-introspection(android) = cascade # from python3 -gobject-introspection(uwp) = cascade # from glib google-cloud-cpp-common:arm64-uwp = cascade google-cloud-cpp-common:x64-uwp = cascade google-cloud-cpp-spanner:arm64-uwp = cascade @@ -956,7 +925,6 @@ gstreamer[wayland](osx | windows) = cascade gtk:arm64-uwp = cascade gtk:arm64-windows = cascade gtk:x64-uwp = cascade -gtk:x64-windows-static = cascade gtk3:x64-windows-static = cascade gtk3(uwp) = cascade gtkmm:arm64-windows = cascade @@ -983,8 +951,6 @@ gz-transport12(osx) = cascade h5py-lzf:arm64-uwp = cascade h5py-lzf:arm64-windows = cascade h5py-lzf:x64-uwp = cascade -halide:arm64-windows = cascade -halide[target-all]:x86-windows = cascade hareflow:arm64-uwp = cascade hareflow:x64-uwp = cascade hareflow:x64-windows-static = cascade @@ -1321,8 +1287,6 @@ liblas:x64-uwp = cascade liblsquic:arm64-uwp = cascade liblsquic:arm64-windows = cascade liblsquic:x64-uwp = cascade -libmagic:arm64-uwp = cascade -libmagic:x64-uwp = cascade libmupdf:arm64-uwp = cascade libmupdf:x64-uwp = cascade libnice:arm64-uwp = cascade @@ -1364,8 +1328,6 @@ librsvg:arm64-uwp = cascade librsvg:x64-uwp = cascade libsm:arm64-uwp = cascade libsm:x64-uwp = cascade -libspatialite:arm64-uwp = cascade -libspatialite:x64-uwp = cascade libtorch:x86-windows = cascade libtorch[vulkan] = cascade # no vulkan sdk installed libtorch(uwp | (arm & windows) | (arm64 & osx)) = cascade @@ -1559,8 +1521,6 @@ opencascade[tbb]:x64-windows-static = cascade opencascade[tbb]:x64-windows-static-md = cascade opencascade[tbb,vtk,freeimage](uwp) = cascade opencc:x64-windows-static = cascade -opencsg:arm64-uwp = cascade -opencsg:x64-uwp = cascade opencv[cuda,cudnn](osx) = cascade opencv[cuda,cudnn,dc1394,dnn-cuda,freetype,gdcm,gstreamer,gtk,halide,openexr,opengl,ovis,python,qt,sfm,tbb,vtk]:arm64-uwp = cascade opencv[cuda,cudnn,dc1394,dnn-cuda,freetype,gdcm,gstreamer,gtk,openexr,opengl,ovis,qt,sfm,tbb,vtk]:x64-uwp = cascade @@ -1601,9 +1561,6 @@ openmama:arm64-uwp = cascade openmama:arm64-windows = cascade openmama:x64-uwp = cascade openmama:x64-windows-static = cascade -openmvg:arm64-uwp = cascade -openmvg:x64-uwp = cascade -openmvg[software]:arm64-windows = cascade openmvs:arm64-uwp = cascade openmvs:arm64-windows = cascade openmvs:x64-linux = cascade @@ -1634,11 +1591,6 @@ openvpn3:arm64-uwp = cascade openvpn3:x64-uwp = cascade osg[nvtt](android | arm) = cascade osg[sdl1](android | osx) = cascade -osg-qt(arm) = cascade -osg-qt(uwp) = cascade -osgearth(android) = cascade # glew -osgearth(arm64 & windows) = cascade # blend2d -osgearth(uwp) = cascade osmanip:arm64-uwp = cascade osmanip:x64-uwp = cascade pagmo2:arm64-uwp = cascade @@ -1699,14 +1651,11 @@ pdal-c:x64-uwp = cascade pdal(uwp) = cascade pixel:arm64-uwp = cascade pixel:x64-uwp = cascade -plplot:arm64-uwp = cascade -plplot:x64-uwp = cascade plplot[x11]:arm64-windows = cascade plplot[x11]:x64-windows = cascade plplot[x11]:x64-windows-static = cascade plplot[x11]:x64-windows-static-md = cascade plplot[x11]:x86-windows = cascade -pmdk:x64-uwp = cascade poco[mysql]:x86-windows = cascade prometheus-cpp[pull]:arm64-uwp = cascade prometheus-cpp[pull]:arm64-windows = cascade @@ -1814,10 +1763,6 @@ qt5-virtualkeyboard:arm64-uwp = cascade qt5-virtualkeyboard:x64-uwp = cascade qt5-webchannel:arm64-uwp = cascade qt5-webchannel:x64-uwp = cascade -qt5-webengine:arm64-uwp = cascade -qt5-webengine:x64-uwp = cascade -qt5-webengine:x64-windows = cascade -qt5-webengine:x86-windows = cascade qt5-webglplugin:arm64-uwp = cascade qt5-webglplugin:x64-uwp = cascade qt5-websockets:arm64-uwp = cascade @@ -1955,7 +1900,6 @@ rtabmap:arm64-uwp = cascade rtabmap:arm64-windows = cascade rtabmap:x64-uwp = cascade rtabmap[opencv-cuda]:x86-windows = cascade -rtlsdr:x64-uwp = cascade ryml:arm64-uwp = cascade ryml:arm64-windows = cascade ryml:x64-uwp = cascade diff --git a/scripts/vcpkg-tool-metadata.txt b/scripts/vcpkg-tool-metadata.txt index 26b7667997..c530b21766 100644 --- a/scripts/vcpkg-tool-metadata.txt +++ b/scripts/vcpkg-tool-metadata.txt @@ -1,6 +1,6 @@ -VCPKG_TOOL_RELEASE_TAG=2025-04-16 -VCPKG_MACOS_SHA=2bb4c23521996f3adbc9f6fe0f6b3ad145c3edceb46c8d3af858fd858fa5a57a5e9aeab8fc393f684e93962a3c122a67fcda8889751a416f0d4de26925fd4991 -VCPKG_MUSLC_SHA=c51e77f7367698ff039400ca76a1e3051ea2f6672bed60d70503d67b011cffd32f393698a936eb4f7d18c8297f6a5438d04ec9dbe75cc0338e74ba2d90be43c9 -VCPKG_GLIBC_SHA=2a4ce33a90d24d520bc03a7206906046b89e85b933573f84efc8e49e6e5f65a6aeae99fae77c5c545217c0c4b93000b9c2dff4accc5385f6f53d0e36bc462adf -VCPKG_GLIBC_ARM64_SHA=1797c3b792d402f835502bd29b5810353ceb1c5f10d1b3d7e4ba59f234516d71ce7b711886a5aaf77e962a31529139c0d9f2811854ba6a7f58ace8eb38723a6e -VCPKG_TOOL_SOURCE_SHA=524f9e7a14a3c66eb745ef4491a3b5127ddc1837902449399cd6ae7f54ccd48f4058289b0ba64ccdb11d9967a7cfb6650f089bca83736dd1b4a8bc87ceffcb24 +VCPKG_TOOL_RELEASE_TAG=2025-05-19 +VCPKG_MACOS_SHA=11fce4028cf7622713d93448276e2a04e663d06e41f161799fc68419dadd56661b542e4e96c5e7dfc3488b60d46a9bd587568dac9c296be7955c5a777843aa45 +VCPKG_MUSLC_SHA=e90b3acb553d079fc5751523c9615f2246544f31299f2cb50dc6bc4b54e3122ef83258b1025826491117ba9baa81765cd76368d305fb40073929de5f25b7726c +VCPKG_GLIBC_SHA=948a0e7ffc97dc5774135dfd0640a2edb300f75590195c5c802feebd44414d8b1f9c06bccfbb6cf9384f9ea8f63dc8c89427a43402ff36a16cf412c9e4000f70 +VCPKG_GLIBC_ARM64_SHA=8db4ea1a6ec11b717076ac79f3b1ccf9172972f5eb07a875c5a2187ac8f0e654648db4714710e9146c6477399a7c22ae6bed839cb179b9e5163103068f65b305 +VCPKG_TOOL_SOURCE_SHA=d928c08b511d93acff107d88212abfa0067febde5a78696b9799a56760380dcf4545c8357105bcdd70563c935b9c73f565c57eba0a2ee7daba6e28bbb88825b4