From 19af97cba8ca48474e4ad15a24ed50271a9ecdac Mon Sep 17 00:00:00 2001 From: talregev Date: Mon, 3 Apr 2023 07:17:41 +0300 Subject: [PATCH] Compile dartsim in windows x86 (#30557) --- ports/dartsim/vcpkg.json | 3 +-- scripts/ci.baseline.txt | 3 +++ versions/baseline.json | 2 +- versions/d-/dartsim.json | 5 +++++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ports/dartsim/vcpkg.json b/ports/dartsim/vcpkg.json index d410210ae9..1ac4af59e0 100644 --- a/ports/dartsim/vcpkg.json +++ b/ports/dartsim/vcpkg.json @@ -1,11 +1,10 @@ { "name": "dartsim", "version": "6.12.2", - "port-version": 1, + "port-version": 2, "description": "Dynamic Animation and Robotics Toolkit", "homepage": "https://dartsim.github.io/", "license": "BSD-2-Clause", - "supports": "!x86", "dependencies": [ "assimp", "boost-algorithm", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index f07b0d24a4..8e78d097d1 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -252,8 +252,11 @@ ftgl:x64-uwp=fail ftgl:arm-uwp=fail # VS 2022 Update 3 seems to have broken Gazebo: https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1522474 +# gazebo is broken due it depend on old ports that already in the new versions. +# There is an open PR that try to fix that. gazebo:x64-windows=fail gazebo:x64-linux=fail +gazebo:x86-windows=fail # gsoap does not offer stable public source downloads gsoap:x64-windows = skip diff --git a/versions/baseline.json b/versions/baseline.json index b761012945..17f5effdc2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1970,7 +1970,7 @@ }, "dartsim": { "baseline": "6.12.2", - "port-version": 1 + "port-version": 2 }, "dataframe": { "baseline": "1.22.0", diff --git a/versions/d-/dartsim.json b/versions/d-/dartsim.json index 478eef48be..9366a8096a 100644 --- a/versions/d-/dartsim.json +++ b/versions/d-/dartsim.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "af3970efb060832f60efe9ad00eef7bc0e824a90", + "version": "6.12.2", + "port-version": 2 + }, { "git-tree": "746ffa24744bf10e2ce9b04332c8dcde2222ba39", "version": "6.12.2",