From 9760ce6194ef51aa4faf77b6321e1280daa4545c Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Mon, 3 Jun 2024 23:05:51 -0700 Subject: [PATCH] [vcpkg baseline][mp3lame, coin] Change fail list in ci.baseline.txt (#39096) ``` PASSING, REMOVE FROM FAIL LIST: mp3lame:arm-neon-android PASSING, REMOVE FROM FAIL LIST: mp3lame:x64-android PASSING, REMOVE FROM FAIL LIST: mp3lame:arm64-android ``` Passing on https://dev.azure.com/vcpkg/public/_build/results?buildId=103545&view=results. Fixed by PR https://github.com/microsoft/vcpkg/pull/38995. Add `supports: !android` for `coin`. - [x] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [ ] ~~SHA512s are updated for each updated download.~~ - [ ] ~~The "supports" clause reflects platforms that may be fixed by this new version.~~ - [ ] ~~Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file.~~ - [ ] ~~Any patches that are no longer applied are deleted from the port's directory.~~ - [x] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [x] Only one version is added to each modified port's versions file. --------- Co-authored-by: Lily Wang --- ports/coin/vcpkg.json | 4 ++-- scripts/ci.baseline.txt | 3 --- versions/baseline.json | 2 +- versions/c-/coin.json | 5 +++++ 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ports/coin/vcpkg.json b/ports/coin/vcpkg.json index a41b70c96f24ae..15fb9c8d32d1ca 100644 --- a/ports/coin/vcpkg.json +++ b/ports/coin/vcpkg.json @@ -1,11 +1,11 @@ { "name": "coin", "version": "4.0.2", - "port-version": 2, + "port-version": 3, "description": "A high-level 3D visualization library with Open Inventor 2.1 API", "homepage": "https://github.com/coin3d/coin", "license": "BSD-3-Clause", - "supports": "!(arm | arm64 | uwp)", + "supports": "!arm & !android & !uwp", "dependencies": [ "boost-assert", "boost-config", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index f97eeaebcff9f9..b57a7bbd831e1b 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -738,9 +738,6 @@ moos-core:x64-android=fail mozjpeg:arm-neon-android=fail mozjpeg:arm64-android=fail mozjpeg:x64-android=fail -mp3lame:arm-neon-android=fail -mp3lame:arm64-android=fail -mp3lame:x64-android=fail mpir:x64-android=fail # ms-gltf and ms-quic require the Microsoft GDK with Xbox Extensions which is not installed on the CI pipeline machines ms-gdkx:x64-windows=fail diff --git a/versions/baseline.json b/versions/baseline.json index 359f6752a1508f..7ec16c7d3336a9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1742,7 +1742,7 @@ }, "coin": { "baseline": "4.0.2", - "port-version": 2 + "port-version": 3 }, "coin-or-buildtools": { "baseline": "2023-02-02", diff --git a/versions/c-/coin.json b/versions/c-/coin.json index f4134869b2a991..5a5eaff06f8ccc 100644 --- a/versions/c-/coin.json +++ b/versions/c-/coin.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9747cd35a942a8d806f44a70bdda8833823826e5", + "version": "4.0.2", + "port-version": 3 + }, { "git-tree": "31a9fad74627bcee6a866110f1377acaf8d81c04", "version": "4.0.2",