From 34a0a3d87cedd50ec0f5d386a7cad37793e2b77b Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Mon, 12 Jun 2023 13:48:01 -0700 Subject: [PATCH 01/10] Update Ubuntu to 22.04. --- scripts/azure-pipelines/linux/create-image.ps1 | 4 ++-- scripts/azure-pipelines/linux/provision-image.sh | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/scripts/azure-pipelines/linux/create-image.ps1 b/scripts/azure-pipelines/linux/create-image.ps1 index 7873dbdaaa6407..537cf4dd5eeecd 100644 --- a/scripts/azure-pipelines/linux/create-image.ps1 +++ b/scripts/azure-pipelines/linux/create-image.ps1 @@ -95,8 +95,8 @@ $VM = Add-AzVMNetworkInterface -VM $VM -Id $Nic.Id $VM = Set-AzVMSourceImage ` -VM $VM ` -PublisherName 'Canonical' ` - -Offer '0001-com-ubuntu-server-focal' ` - -Skus '20_04-lts' ` + -Offer '0001-com-ubuntu-server-jammy' ` + -Skus '22_04-lts' ` -Version latest $VM = Set-AzVMBootDiagnostic -VM $VM -Disable diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh index 4b5ebd7f883e61..ef691e6407428f 100755 --- a/scripts/azure-pipelines/linux/provision-image.sh +++ b/scripts/azure-pipelines/linux/provision-image.sh @@ -8,14 +8,13 @@ export DEBIAN_FRONTEND=noninteractive # Add apt repos ## CUDA -apt-key del 7fa2af80 -wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-ubuntu2004.pin -mv cuda-ubuntu2004.pin /etc/apt/preferences.d/cuda-repository-pin-600 -apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/3bf863cc.pub -add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/ /" +wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/cuda-ubuntu2204.pin +mv cuda-ubuntu2204.pin /etc/apt/preferences.d/cuda-repository-pin-600 +apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/3bf863cc.pub +add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/ /" ## PowerShell -wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb +wget -q https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb dpkg -i packages-microsoft-prod.deb rm -f packages-microsoft-prod.deb add-apt-repository universe @@ -104,7 +103,7 @@ APT_PACKAGES="$APT_PACKAGES powershell" if [[ $(grep microsoft /proc/version) ]]; then echo "Skipping install of ADO prerequisites on WSL." else -APT_PACKAGES="$APT_PACKAGES libkrb5-3 zlib1g libicu66" +APT_PACKAGES="$APT_PACKAGES libkrb5-3 zlib1g libicu70 debsums liblttng-ust1" fi apt-get -y --no-install-recommends install $APT_PACKAGES From 09dcf2c4b4b014e4b7d026997d2f0bf7d933b498 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Mon, 12 Jun 2023 13:50:59 -0700 Subject: [PATCH 02/10] Remove dead things in Ubuntu 22.04. --- scripts/azure-pipelines/linux/provision-image.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh index ef691e6407428f..dafaa37e0aa673 100755 --- a/scripts/azure-pipelines/linux/provision-image.sh +++ b/scripts/azure-pipelines/linux/provision-image.sh @@ -71,7 +71,7 @@ APT_PACKAGES="$APT_PACKAGES nodejs" APT_PACKAGES="$APT_PACKAGES libwayland-dev" ## required by all GN projects -APT_PACKAGES="$APT_PACKAGES python2 python-is-python3" +APT_PACKAGES="$APT_PACKAGES python-is-python3" ## required by libctl APT_PACKAGES="$APT_PACKAGES guile-2.2-dev" @@ -88,9 +88,6 @@ APT_PACKAGES="$APT_PACKAGES libxtst-dev" ## required by bond APT_PACKAGES="$APT_PACKAGES haskell-stack" -## required by duktape -APT_PACKAGES="$APT_PACKAGES python-yaml" - ## CUDA APT_PACKAGES="$APT_PACKAGES cuda-compiler-12-1 cuda-libraries-dev-12-1 cuda-driver-dev-12-1 \ cuda-cudart-dev-12-1 libcublas-12-1 libcurand-dev-12-1 cuda-nvml-dev-12-1 libcudnn8-dev libnccl2 \ From ce97990816de0001cb706b753fb7f9ba065b8cc7 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 14 Jun 2023 19:32:11 -0700 Subject: [PATCH 03/10] Adjust ci.baseline.txt for 22.04: Need Python2: blitz duktape keystone bond was just reordered together. coin-or-ipopt fails to find lapack despite depending on intel-mkl; previously blocked by coinutils failing. Have dynamic exception specs that are now rejected: libodb log4cpp wpilib triggers what looks like a strange gcc-11 bug? --- scripts/ci.baseline.txt | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index aa3f2df280fc8e..9e25c91564b868 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -84,12 +84,17 @@ blitz:x64-android=fail blitz:x64-uwp=fail blitz:arm64-windows=fail blitz:arm-uwp=fail +blitz:x64-linux=fail # python2 boinc:arm-neon-android=fail boinc:arm64-android=fail boinc:x64-android=fail bond:arm-neon-android=fail +bond:arm-uwp=fail bond:arm64-android=fail +bond:arm64-osx=fail bond:x64-android=fail +bond:x64-osx=fail +bond:x64-uwp=fail # Conflicts with openssl boringssl:arm-neon-android=skip boringssl:arm64-android=skip @@ -104,10 +109,6 @@ boringssl:x64-windows=skip boringssl:x64-windows-static=skip boringssl:x64-windows-static-md=skip boringssl:x86-windows=skip -bond:arm-uwp=fail -bond:x64-osx=fail -bond:arm64-osx=fail -bond:x64-uwp=fail botan:arm-neon-android=fail botan:arm64-android=fail botan:x64-android=fail @@ -240,8 +241,7 @@ cnats:x64-android=fail coin:arm64-windows=fail coin:arm-uwp=fail coin:x64-uwp=fail -# coinutils requires autoconf2.71 not yet available in CI -coinutils:x64-linux=fail +coin-or-ipopt:x64-linux=fail # there is an ICE in VS2022 with colmap in release mode colmap:x86-windows=fail colmap:x64-windows=fail @@ -359,6 +359,7 @@ duktape:arm64-android=fail duktape:x64-android=fail duktape:x64-osx=skip duktape:arm64-osx=skip +duktape:x64-linux=fail eastl:arm-uwp=fail easyloggingpp:arm-uwp=fail @@ -633,6 +634,7 @@ jinja2cpplight:x64-android=fail jinja2cpplight:x64-uwp=fail json-schema-validator:arm-neon-android=fail json-schema-validator:arm64-android=fail +keystone:x64-linux=fail # python2 kfr:arm64-windows=fail kfr:x64-android=fail kfr:x64-uwp=fail @@ -772,6 +774,7 @@ libmysql:arm64-android=fail libmysql:x64-android=fail libmysql:x86-windows=fail libmysql:arm64-windows=fail +libodb:x64-linux=fail # dynamic exception specifications libopensp:arm-neon-android=fail libopensp:arm64-android=fail libopensp:x64-android=fail @@ -895,6 +898,7 @@ llvm:arm64-android=fail llvm:x64-android=fail log4cplus:arm-uwp=fail log4cplus:x64-uwp=fail +log4cpp:x64-linux=fail # dynamic exception specifications log4cxx:arm-uwp=fail log4cxx:x64-uwp=fail loguru:arm-neon-android=fail @@ -1689,6 +1693,7 @@ wpilib:arm64-android=fail wpilib:arm64-windows=fail wpilib:x64-android=fail wpilib:x64-osx=fail +wpilib:x64-linux=fail wincrypt:arm64-windows=skip # https://github.com/microsoft/vcpkg-tool/pull/599 x264:arm-neon-android=fail x264:arm64-android=fail From cbd7bb5145f0f5ea39638051a47046c99d246080 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 14 Jun 2023 19:33:31 -0700 Subject: [PATCH 04/10] Remove Python2 from vcpkg-find-acquire-program test. --- .../test_ports/vcpkg-find-acquire-program/portfile.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/test_ports/vcpkg-find-acquire-program/portfile.cmake b/scripts/test_ports/vcpkg-find-acquire-program/portfile.cmake index 0316fc2b69b27d..7771f1e51a5bb4 100644 --- a/scripts/test_ports/vcpkg-find-acquire-program/portfile.cmake +++ b/scripts/test_ports/vcpkg-find-acquire-program/portfile.cmake @@ -3,7 +3,7 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled) # For each vcpkg_find_acquire_program(NAME).cmake script, # there must be a literal call to vcpkg_find_acquire_program(NAME).cmake -set(variables BAZEL BISON FLEX GIT GN NINJA PERL PKGCONFIG PYTHON2 PYTHON3 YASM) +set(variables BAZEL BISON FLEX GIT GN NINJA PERL PKGCONFIG PYTHON3 YASM) vcpkg_find_acquire_program(BAZEL) vcpkg_find_acquire_program(BISON) vcpkg_find_acquire_program(FLEX) @@ -12,11 +12,10 @@ vcpkg_find_acquire_program(GN) vcpkg_find_acquire_program(NINJA) vcpkg_find_acquire_program(PERL) vcpkg_find_acquire_program(PKGCONFIG) -vcpkg_find_acquire_program(PYTHON2) vcpkg_find_acquire_program(PYTHON3) vcpkg_find_acquire_program(YASM) -if(NOT VCPKG_TARGET_IS_OSX) +if(VCPKG_TARGET_IS_OSX) # System python too old (3.9; meson needs 3.10) list(APPEND variables MESON) vcpkg_find_acquire_program(MESON) @@ -28,7 +27,7 @@ if(VCPKG_HOST_IS_LINUX) endif() if(VCPKG_HOST_IS_WINDOWS) - list(APPEND variables 7Z ARIA2 CLANG DARK DOXYGEN GASPREPROCESSOR GO GPERF JOM NASM NUGET RUBY SCONS SWIG) + list(APPEND variables 7Z ARIA2 CLANG DARK DOXYGEN GASPREPROCESSOR GO GPERF JOM NASM NUGET PYTHON2 RUBY SCONS SWIG) vcpkg_find_acquire_program(7Z) vcpkg_find_acquire_program(ARIA2) vcpkg_find_acquire_program(CLANG) @@ -40,6 +39,7 @@ if(VCPKG_HOST_IS_WINDOWS) vcpkg_find_acquire_program(JOM) vcpkg_find_acquire_program(NASM) vcpkg_find_acquire_program(NUGET) + vcpkg_find_acquire_program(PYTHON2) vcpkg_find_acquire_program(RUBY) vcpkg_find_acquire_program(SCONS) vcpkg_find_acquire_program(SWIG) From bfb429bb01b754a705f27313c05fda46a3f45e95 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 14 Jun 2023 21:01:14 -0700 Subject: [PATCH 05/10] Update pools. --- scripts/azure-pipelines/azure-pipelines.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 7ebeb3c9edf0fa..5835979ceb65a8 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -2,9 +2,9 @@ # SPDX-License-Identifier: MIT # variables: - android-pool: 'PrAnd-2023-05-09' - linux-pool: 'PrLin-2023-05-09' - windows-pool: 'PrWin-2023-05-09' + android-pool: 'PrAnd-2023-06-14' + linux-pool: 'PrLin-2023-06-14' + windows-pool: 'PrWin-2023-06-14' osx-pool: 'PrOsx-2022-02-04' linux-docker-image: 'andcontainerregistry.azurecr.io/vcpkg-android:2023-04-20' @@ -112,4 +112,4 @@ jobs: poolName: $(android-pool) dockerImage: $(linux-docker-image) vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - tripletPattern: ${{ parameters.tripletPattern }} \ No newline at end of file + tripletPattern: ${{ parameters.tripletPattern }} From bd0f5b1ca16f7fd8b4e1810f19bb7ee089afb8cb Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 15 Jun 2023 18:28:25 +0000 Subject: [PATCH 06/10] [bond] Redirect haskell stack to buildtrees. Works around this: ``` 2023-06-15 02:20:52.210449: [debug] Checking for project config at: /home/bion/work/buildtrees/bond/src/10.0.0-efd5420c47.clean/compiler/stack.yaml 2023-06-15 02:20:52.210604: [debug] Loading project config file stack.yaml 2023-06-15 02:20:52.212319: [error] Preventing creation of stack root '/home/agent/.stack/'. Parent directory '/home/' is owned by someone else. ``` --- ports/bond/portfile.cmake | 8 +++++--- ports/bond/vcpkg.json | 1 + versions/b-/bond.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ports/bond/portfile.cmake b/ports/bond/portfile.cmake index 4c70c9f44b73ce..2e119751510866 100644 --- a/ports/bond/portfile.cmake +++ b/ports/bond/portfile.cmake @@ -6,7 +6,9 @@ vcpkg_from_github( REF "${VERSION}" SHA512 a5475d3f988928fc3d03b69fc34b33ada35bd790138a0f4a733642558c72945e79c5dcde88b656cbc1cafbc3cb2dd4ba28031e09e507d730056876148ef65014 HEAD_REF master - PATCHES fix-install-path.patch skip-grpc-compilation.patch + PATCHES + fix-install-path.patch + skip-grpc-compilation.patch ) if (VCPKG_TARGET_IS_WINDOWS) @@ -31,7 +33,6 @@ else() # The build needs a version of the Haskel Tool stack that is newer than some distros ship with. # For this reason the message is not guarded by checking to see if the tool is installed. message("\nA recent version of Haskell Tool Stack is required to build.\n For information on how to install see https://docs.haskellstack.org/en/stable/README/\n") - endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -39,6 +40,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS bond-over-grpc BOND_ENABLE_GRPC ) +set(ENV{STACK_ROOT} "${CURRENT_BUILDTREES_DIR}/stack") + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE @@ -46,7 +49,6 @@ vcpkg_cmake_configure( -DBOND_LIBRARIES_ONLY=TRUE -DBOND_GBC_PATH=${FETCHED_GBC_PATH} -DBOND_SKIP_GBC_TESTS=TRUE - -DBOND_ENABLE_COMM=FALSE -DBOND_FIND_RAPIDJSON=TRUE -DBOND_STACK_OPTIONS=--allow-different-user ${FEATURE_OPTIONS} diff --git a/ports/bond/vcpkg.json b/ports/bond/vcpkg.json index 1fc94cea811587..7e28e4a4e60162 100644 --- a/ports/bond/vcpkg.json +++ b/ports/bond/vcpkg.json @@ -1,6 +1,7 @@ { "name": "bond", "version": "10.0.0", + "port-version": 1, "description": "Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services.", "homepage": "https://github.com/Microsoft/bond", "dependencies": [ diff --git a/versions/b-/bond.json b/versions/b-/bond.json index 4ce5e1675fa552..8fb5504bdc9e04 100644 --- a/versions/b-/bond.json +++ b/versions/b-/bond.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5d9b960403809575097267ac43d1ce18e9b2a7f2", + "version": "10.0.0", + "port-version": 1 + }, { "git-tree": "5ce8875d8de21ca31d61b521c2e84a974e325436", "version": "10.0.0", diff --git a/versions/baseline.json b/versions/baseline.json index 01c72fab5a8f38..a4dc4a18bd9e75 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -618,7 +618,7 @@ }, "bond": { "baseline": "10.0.0", - "port-version": 0 + "port-version": 1 }, "boolinq": { "baseline": "3.0.4", From 915f5fd8f9e49c0da79ea38eba4878e376cf6606 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 15 Jun 2023 19:25:21 +0000 Subject: [PATCH 07/10] Fix some PASSING: REMOVE FROM FAIL LIST entries. --- scripts/ci.baseline.txt | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 9e25c91564b868..48083d2062563a 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -256,12 +256,10 @@ concurrencpp:x64-osx=fail constexpr-contracts:arm-neon-android=fail constexpr-contracts:arm64-android=fail constexpr-contracts:x64-android=fail -constexpr-contracts:x64-linux=fail coroutine:arm-neon-android=fail coroutine:arm-uwp=fail coroutine:arm64-android=fail coroutine:x64-android=fail -coroutine:x64-linux=fail coroutine:x64-uwp=fail cpp-ipc:arm-neon-android=fail cpp-ipc:arm64-android=fail @@ -289,9 +287,6 @@ cppslippi:x64-osx=fail cppcoro:x64-linux=fail cppcoro:arm-uwp=fail cppcoro:x64-uwp=fail -# The x64-linux pipeline uses gcc 9.3.0, which lacks C++20 coroutine support. -# This is known to work on x64-linux as of gcc 10.3.0. -cppgraphqlgen:x64-linux=fail cpptoml:arm-neon-android=fail cpptoml:arm64-android=fail cpptoml:x64-android=fail @@ -341,8 +336,6 @@ discord-game-sdk:x64-windows-static=fail discord-game-sdk:x64-windows-static-md=fail discord-rpc:arm-uwp=fail discord-rpc:x64-uwp=fail -# requires g++11 -discordcoreapi:x64-linux=fail discount:x64-android=fail dlib:arm-uwp=fail dlib:x64-uwp=fail @@ -1369,13 +1362,9 @@ rsasynccpp:arm64-windows=fail rsasynccpp:arm-uwp=fail rsasynccpp:x64-linux=fail rsasynccpp:x64-osx=fail -# Requires g++10 but CI compiler only has g++9 -rsm-binary-io:x64-linux=fail rsm-bsa:arm-neon-android=fail rsm-bsa:arm64-android=fail rsm-bsa:x64-android=fail -# Requires g++10 but CI compiler only has g++9 -rsm-bsa:x64-linux=fail rtlsdr:x64-uwp=fail rtlsdr:arm64-windows=fail rtlsdr:arm-uwp=fail From 482319aa854288cfb15baf59ecdcea46d6de7199 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 15 Jun 2023 19:26:21 +0000 Subject: [PATCH 08/10] Undo vcpkg-find-acquire-program test port brain fart pointed out by @dg0yt: https://github.com/microsoft/vcpkg/pull/32014/files/bfb429bb01b754a705f27313c05fda46a3f45e95#r1230424844 --- scripts/test_ports/vcpkg-find-acquire-program/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/test_ports/vcpkg-find-acquire-program/portfile.cmake b/scripts/test_ports/vcpkg-find-acquire-program/portfile.cmake index 7771f1e51a5bb4..f6ce20fefa8b76 100644 --- a/scripts/test_ports/vcpkg-find-acquire-program/portfile.cmake +++ b/scripts/test_ports/vcpkg-find-acquire-program/portfile.cmake @@ -15,7 +15,7 @@ vcpkg_find_acquire_program(PKGCONFIG) vcpkg_find_acquire_program(PYTHON3) vcpkg_find_acquire_program(YASM) -if(VCPKG_TARGET_IS_OSX) +if(NOT VCPKG_TARGET_IS_OSX) # System python too old (3.9; meson needs 3.10) list(APPEND variables MESON) vcpkg_find_acquire_program(MESON) From 8e9049dd7220f695455d9b5c13618704657e7ffe Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 15 Jun 2023 16:33:56 -0700 Subject: [PATCH 09/10] Update vcpkg-tool to 2023-06-15. https://github.com/microsoft/vcpkg-tool/releases/tag/2023-06-15 Hopefully this fixes the intermittent OOMs we've been seeing. --- scripts/bootstrap.ps1 | 2 +- scripts/bootstrap.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 1674786749e76a..04d4a5c5b023c6 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root")) Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" -$versionDate = '2023-06-08' +$versionDate = '2023-06-15' if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64' -or $env:PROCESSOR_IDENTIFIER -match "ARMv[8,9] \(64-bit\)") { & "$scriptsDir/tls12-download-arm64.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg-arm64.exe" "$vcpkgRootDir\vcpkg.exe" } else { diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 50f31c7541ba34..c9db563d21da89 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -128,23 +128,23 @@ fi # Choose the vcpkg binary to download vcpkgDownloadTool="ON" -vcpkgToolReleaseTag="2023-06-08" +vcpkgToolReleaseTag="2023-06-15" if [ "$UNAME" = "Darwin" ]; then echo "Downloading vcpkg-macos..." - vcpkgToolReleaseSha="d094a52e23f7ddd18b91790f9c08b1f7974c724f5f161d758a8d6d8db9d8a1946e7f819cc1bef3663702337db075610cb021d53b8a9d68a16ac2dc4fca8980aa" + vcpkgToolReleaseSha="3a746ca1402b5ac6cd26d09077681c4f8d1090a06ed4243574d81bcff22d651eae5a47107b407828bfa36236f2c4c02d3e2c6392d92b8c5aaf9992f332091f35" vcpkgToolName="vcpkg-macos" elif [ "$vcpkgUseMuslC" = "ON" ]; then echo "Downloading vcpkg-muslc..." - vcpkgToolReleaseSha="e027fdaac7a0517cf8222a7a8991283173f4004dc521163c1db8716cb5a36f8f0bfc043dd508464535187408534c8efad14710d2c7fc6be291c90ecc856f011c" + vcpkgToolReleaseSha="0426668fbfaece4f51798c1ee201ffbc26b0b239e212ce6118b2ab5d2490b414a01e725b05ce98c8a95d06341a70405f4223bd4f42e291c5792ec2a631e22cc1" vcpkgToolName="vcpkg-muslc" elif [ "$ARCH" = "x86_64" ]; then echo "Downloading vcpkg-glibc..." - vcpkgToolReleaseSha="c517fc369d7c2f0132de9c90e9960becb58dbd8936ec39699a69d148a60a01e7416c00dfc44d34c99d7bc41dcba50b6b5707969f757ed46514494ca08e948187" + vcpkgToolReleaseSha="4c49238277cecc81cf0a152f9505e4020290e25ada736ec8ff956f740e5e4b986a9e5c3cc0816f4c9ccde06639cb5275d57ea86818060573fa246d019ef835f8" vcpkgToolName="vcpkg-glibc" else echo "Unable to determine a binary release of vcpkg; attempting to build from source." vcpkgDownloadTool="OFF" - vcpkgToolReleaseSha="85afece575943969502e2fd21cd91dc4ba1629d4b90ea6db66ba1c59f0abac5aa8d4a82a12f73088a6a3601e6b524b03de1a50b32250709a223715200a7fa2fd" + vcpkgToolReleaseSha="05c50173959634a4557b756fce78f92bbc38bf23c91d4c41368c24f91e9479966fb4537a391cee2141423edd6cf84ca488c9e1d57323aa65575baa0ecc6af8e3" fi # Do the download or build. From 822a8317e8247d91fb3c31b6330458b477844dff Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Mon, 19 Jun 2023 22:25:28 +0000 Subject: [PATCH 10/10] ci.baseline.txt openmvg. --- scripts/ci.baseline.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 7a3fe350872494..cd9e3427f4f496 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1145,6 +1145,7 @@ openmesh:x64-uwp=fail openmpi:arm-neon-android=fail openmpi:arm64-android=fail openmpi:x64-android=fail +openmvg:x64-linux=fail openscap:arm-neon-android=fail openscap:arm64-android=fail openscap:x64-android=fail