aboutsummaryrefslogtreecommitdiff
path: root/versions
diff options
context:
space:
mode:
authorPhoebe <20694052+PhoebeHui@users.noreply.github.com>2021-08-10 00:07:37 +0800
committerGitHub <noreply@github.com>2021-08-09 09:07:37 -0700
commite1e7daf3abb8b55b8034360263e1c0d29429fdff (patch)
treecf8bab6b67de02587d9c612c3f739955f3dc2256 /versions
parent7893cbb48a8e639e6a8d63819ca7610327907de8 (diff)
downloadvcpkg-e1e7daf3abb8b55b8034360263e1c0d29429fdff.tar.gz
vcpkg-e1e7daf3abb8b55b8034360263e1c0d29429fdff.zip
[vcpkg baseline][rbdl-orb/rbdl/ptex] file conflicts, skip rbdl-orb in CI testing (#19453)
* [vcpkg baseline][rbdl-orb/rbdl] file conflicts, skip rbdl-orb in Ci testing * [ptex] Add DISABLE_PARALLEL_CONFIGURE * Update the baseline version * Add missing quotes * Update the baseline version
Diffstat (limited to 'versions')
-rw-r--r--versions/baseline.json6
-rw-r--r--versions/p-/ptex.json5
-rw-r--r--versions/r-/rbdl-orb.json5
-rw-r--r--versions/r-/rbdl.json5
4 files changed, 18 insertions, 3 deletions
diff --git a/versions/baseline.json b/versions/baseline.json
index 2769193a0..5897e401d 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5102,7 +5102,7 @@
},
"ptex": {
"baseline": "2.3.2",
- "port-version": 2
+ "port-version": 3
},
"pthread": {
"baseline": "3.0.0",
@@ -5530,11 +5530,11 @@
},
"rbdl": {
"baseline": "2.6.0",
- "port-version": 0
+ "port-version": 1
},
"rbdl-orb": {
"baseline": "3.0.0",
- "port-version": 0
+ "port-version": 1
},
"re2": {
"baseline": "2020-10-01",
diff --git a/versions/p-/ptex.json b/versions/p-/ptex.json
index 3a7baab15..47f9c2dca 100644
--- a/versions/p-/ptex.json
+++ b/versions/p-/ptex.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "c524a2ab1940315d3481e9fbf745425caf5b7c15",
+ "version": "2.3.2",
+ "port-version": 3
+ },
+ {
"git-tree": "e4ee03f1ba1d9c807b8baee1bd3b1089e71476ca",
"version-string": "2.3.2",
"port-version": 2
diff --git a/versions/r-/rbdl-orb.json b/versions/r-/rbdl-orb.json
index 0b2c7b6ae..f2ec0ef61 100644
--- a/versions/r-/rbdl-orb.json
+++ b/versions/r-/rbdl-orb.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "5850c6901f4123803184bfe9b6e587af9350331a",
+ "version": "3.0.0",
+ "port-version": 1
+ },
+ {
"git-tree": "d475aade9be86281a6db741ee68e30a23d0f16d3",
"version": "3.0.0",
"port-version": 0
diff --git a/versions/r-/rbdl.json b/versions/r-/rbdl.json
index 2091d05bb..832ea5af4 100644
--- a/versions/r-/rbdl.json
+++ b/versions/r-/rbdl.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "44606d1a4e33112ca45274e823041ad877e62623",
+ "version": "2.6.0",
+ "port-version": 1
+ },
+ {
"git-tree": "c2823f8341acd1e564485661989fb3780a6b4a2a",
"version-string": "2.6.0",
"port-version": 0