aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Neumann <30894796+Neumann-A@users.noreply.github.com>2021-03-16 19:45:07 +0100
committerGitHub <noreply@github.com>2021-03-16 11:45:07 -0700
commit6d3a6a31294ea51076bfdfa00a5025e5a846184d (patch)
treef96f5d0d1d998bb29e853b5c2ffeb837f32432d7
parent617247756f54cc391e5082930676ded1f553c397 (diff)
downloadvcpkg-6d3a6a31294ea51076bfdfa00a5025e5a846184d.tar.gz
vcpkg-6d3a6a31294ea51076bfdfa00a5025e5a846184d.zip
[gmp] correct supports field to run CI for other platforms (#15957)
* fix supports field to correctly run CI for other platforms * Merge from master * Update baseline version * Fix the format issue * Fix baseline version * Revert the changes for host * Fix the baseline version * Disable mpfr:x64-osx and mpfr:x64-linux in Ci testing Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
-rw-r--r--ports/gmp/vcpkg.json4
-rw-r--r--scripts/ci.baseline.txt2
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/g-/gmp.json5
4 files changed, 10 insertions, 3 deletions
diff --git a/ports/gmp/vcpkg.json b/ports/gmp/vcpkg.json
index f19d55d43..71cedfec5 100644
--- a/ports/gmp/vcpkg.json
+++ b/ports/gmp/vcpkg.json
@@ -1,10 +1,10 @@
{
"name": "gmp",
"version-string": "6.2.1",
- "port-version": 3,
+ "port-version": 4,
"description": "The GNU Multiple Precision Arithmetic Library",
"homepage": "https://gmplib.org",
- "supports": "windows & !(arm | arm64)",
+ "supports": "!(windows & (arm | arm64))",
"dependencies": [
{
"name": "vs-yasm",
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index a9ab38084..d82c67fae 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -993,6 +993,8 @@ mpir:x64-windows-static-md=skip
mpir:arm64-windows=skip
mpir:x64-osx=skip
mpir:x64-linux=skip
+mpfr:x64-osx=fail
+mpfr:x64-linux=fail
msix:x64-linux=fail
msix:x64-osx=fail
msix:x64-windows-static=fail
diff --git a/versions/baseline.json b/versions/baseline.json
index 12504f1e8..7f4e2ecbd 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2262,7 +2262,7 @@
},
"gmp": {
"baseline": "6.2.1",
- "port-version": 3
+ "port-version": 4
},
"google-cloud-cpp": {
"baseline": "1.25.0",
diff --git a/versions/g-/gmp.json b/versions/g-/gmp.json
index 1ba3f1ed5..752fcb448 100644
--- a/versions/g-/gmp.json
+++ b/versions/g-/gmp.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "f53fd9a3e8e462a592c3811cf6c9dd2aec0f31e1",
+ "version-string": "6.2.1",
+ "port-version": 4
+ },
+ {
"git-tree": "3b7459d7ea886b86c9c80890c0b697df9df3cce1",
"version-string": "6.2.1",
"port-version": 3