diff --git a/ports/bde/vcpkg.json b/ports/bde/vcpkg.json index e215c449b4..d25ccad849 100644 --- a/ports/bde/vcpkg.json +++ b/ports/bde/vcpkg.json @@ -1,9 +1,13 @@ { + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "bde", "version": "4.8.0.0", + "port-version": 1, "description": "Basic Development Environment - a set of foundational C++ libraries used at Bloomberg.", + "homepage": "https://techatbloomberg.com/", + "documentation": "https://bloomberg.github.io/bde/", "license": "Apache-2.0", - "supports": "!windows & !arm & !android & !osx", + "supports": "!android & !(arm64 & windows) & !uwp", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index feaa005583..952f86b52a 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -21,10 +21,11 @@ ## ## ## CI tested triplets: -## arm64-android -## arm64-windows ## arm-neon-android +## arm64-android +## arm64-osx ## arm64-uwp +## arm64-windows ## x64-android ## x64-linux ## x64-osx @@ -74,7 +75,13 @@ atliac-minitest:x64-uwp=fail backward-cpp:arm-neon-android=fail backward-cpp:arm64-android=fail backward-cpp:x64-android=fail -bde:x64-linux=skip +bde:arm64-osx =skip # conflict https://github.com/microsoft/vcpkg/pull/32645 +bde:x64-linux =skip +bde:x64-osx =skip +bde:x64-windows-static-md =skip +bde:x64-windows-static =skip +bde:x64-windows =skip +bde:x86-windows =skip bento4:arm-neon-android=fail berkeleydb:arm-neon-android=fail berkeleydb:arm64-android=fail @@ -656,14 +663,17 @@ libtomcrypt:arm64-uwp=fail libusb-win32:arm64-uwp=fail libusb-win32:x64-uwp=fail #Skip detection to avoid upstream remove older releases -libvmdk:x86-windows=skip -libvmdk:x64-windows=skip -libvmdk:x64-windows-static=skip -libvmdk:x64-windows-static-md=skip -libvmdk:arm64=skip -libvmdk:x64-linux=skip -libvmdk:x64-osx=skip -libvmdk:arm64-osx=skip +libvmdk:arm-neon-android =skip # upstream issue https://github.com/microsoft/vcpkg/pull/13765#issuecomment-699710253 +libvmdk:arm64-android =skip +libvmdk:arm64-osx =skip +libvmdk:arm64-windows =skip +libvmdk:x64-android =skip +libvmdk:x64-linux =skip +libvmdk:x64-osx =skip +libvmdk:x64-windows-static-md =skip +libvmdk:x64-windows-static =skip +libvmdk:x64-windows =skip +libvmdk:x86-windows =skip libwandio:arm-neon-android=fail libwandio:arm64-android=fail libwandio:x64-android=fail @@ -1141,9 +1151,9 @@ tensorflow-cc:x64-windows=fail # Also skipping because our macOS machines are relatively underpowered and this saves 8 hours of CI # time for a relatively unpopular library / system combo. tensorflow:x64-osx=skip -tensorflow:arm-osx=skip +tensorflow:arm64-osx =skip tensorflow-cc:x64-osx=skip -tensorflow-cc:arm-osx=skip +tensorflow-cc:arm64-osx =skip thorvg:arm-neon-android=fail tinycthread:arm-neon-android=fail diff --git a/versions/b-/bde.json b/versions/b-/bde.json index 0decc5b947..953a47a0d4 100644 --- a/versions/b-/bde.json +++ b/versions/b-/bde.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bcc715b2f958a15fb5f05a8a5f717b8091c35f05", + "version": "4.8.0.0", + "port-version": 1 + }, { "git-tree": "fa76296b5abefaf07a8f663ced20cea1a0c901b6", "version": "4.8.0.0", diff --git a/versions/baseline.json b/versions/baseline.json index 78e19d64b5..77d16b24af 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -558,7 +558,7 @@ }, "bde": { "baseline": "4.8.0.0", - "port-version": 0 + "port-version": 1 }, "bdwgc": { "baseline": "8.2.6",