Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[scripts/ci.baseline.txt] Fix incorrect entries [bde] Add some platform support #39119

Merged
merged 2 commits into from
Jun 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ports/bde/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
36 changes: 23 additions & 13 deletions scripts/ci.baseline.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -654,14 +661,17 @@ libtomcrypt:arm64-uwp=fail
libusb-win32:arm64-uwp=fail
libusb-win32:x64-uwp=fail
#Skip detection to avoid upstream remove older releases
WangWeiLin-MV marked this conversation as resolved.
Show resolved Hide resolved
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
Expand Down Expand Up @@ -1132,9 +1142,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
Expand Down
5 changes: 5 additions & 0 deletions versions/b-/bde.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "bcc715b2f958a15fb5f05a8a5f717b8091c35f05",
"version": "4.8.0.0",
"port-version": 1
},
{
"git-tree": "fa76296b5abefaf07a8f663ced20cea1a0c901b6",
"version": "4.8.0.0",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@
},
"bde": {
"baseline": "4.8.0.0",
"port-version": 0
"port-version": 1
},
"bdwgc": {
"baseline": "8.2.6",
Expand Down