From 8c8f5d808769280420487dbecda9b5fe645d5e20 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 29 Dec 2022 13:24:59 +0100 Subject: [PATCH 1/2] [boost-regex] icu unsupported on uwp --- scripts/ci.baseline.txt | 7 ++++- scripts/test_ports/vcpkg-ci-boost/vcpkg.json | 30 +++++++++----------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 08026e7c7f71dc..6dcd8fc06da7d9 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1267,9 +1267,14 @@ vcpkg-ci-arrow:x64-windows-static=pass vcpkg-ci-arrow:x64-windows-static-md=pass vcpkg-ci-arrow:x64-osx=pass vcpkg-ci-arrow:x64-linux=pass -vcpkg-ci-boost:x64-linux=pass +vcpkg-ci-boost:arm-neon-android=pass +vcpkg-ci-boost:arm64-android=pass +vcpkg-ci-boost:arm64-uwp=pass vcpkg-ci-boost:arm64-windows=pass +vcpkg-ci-boost:x64-android=pass +vcpkg-ci-boost:x64-linux=pass vcpkg-ci-boost:x64-osx=pass +vcpkg-ci-boost:x64-uwp=pass vcpkg-ci-boost:x64-windows-static-md=pass vcpkg-ci-boost:x64-windows-static=pass vcpkg-ci-boost:x64-windows=pass diff --git a/scripts/test_ports/vcpkg-ci-boost/vcpkg.json b/scripts/test_ports/vcpkg-ci-boost/vcpkg.json index 0721b95e33381e..472288ac0960a0 100644 --- a/scripts/test_ports/vcpkg-ci-boost/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-boost/vcpkg.json @@ -9,7 +9,7 @@ "features": [ "mpi" ], - "platform":"!(arm & windows)" + "platform": "!staticcrt & !(arm & windows) & !uwp" }, { "name": "boost-asio", @@ -24,7 +24,7 @@ "features": [ "numa" ], - "platform":"!uwp & !arm & !emscripten" + "platform": "!uwp & !arm & !emscripten" }, { "name": "boost-locale", @@ -32,7 +32,7 @@ "features": [ "icu" ], - "platform":"!uwp" + "platform": "!uwp" }, { "name": "boost-mpi", @@ -40,11 +40,11 @@ "features": [ "python3" ], - "platform": "!static & !(arm & windows)" + "platform": "!staticcrt & !static & !uwp & !(arm & windows)" }, { - "name":"boost-odeint", - "default-features":false + "name": "boost-odeint", + "default-features": false }, { "name": "boost-odeint", @@ -52,27 +52,23 @@ "features": [ "mpi" ], - "platform": "!(arm & windows)" + "platform": "!staticcrt & !uwp & !(windows & arm)" }, { "name": "boost-python", - "default-features":false, - "features":[ - "python2" + "default-features": false, + "features": [ + "python3" ], - "platform":"!(arm & windows)" + "platform": "!emscripten & !ios & !android & !uwp" }, { "name": "boost-python", "default-features": false, "features": [ - "python3" + "python2" ], - "platform":"!uwp" - }, - { - "name":"boost-regex", - "default-features":false + "platform": "!android & !emscripten & !ios & !(arm & osx) & !(arm & windows) & !uwp" }, { "name": "boost-regex", From a1e977c4427a8cf92eeaaf3f733511df6801865d Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sun, 17 Dec 2023 16:15:57 +0100 Subject: [PATCH 2/2] CI