From 11e616497f58a6fedc301990841eb520faa947b9 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Mon, 16 Sep 2024 17:22:47 +0200 Subject: [PATCH 1/3] Update casadi to 3.6.6 and stop using ami-iit fork --- cmake/Buildcasadi.cmake | 10 +++------- cmake/ProjectsTagsStable.cmake | 4 ++-- cmake/ProjectsTagsUnstable.cmake | 4 ++-- releases/latest.releases.yaml | 4 ++-- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/cmake/Buildcasadi.cmake b/cmake/Buildcasadi.cmake index f832539e8..e18f526fa 100644 --- a/cmake/Buildcasadi.cmake +++ b/cmake/Buildcasadi.cmake @@ -28,8 +28,8 @@ endif() ycm_ep_helper(casadi TYPE GIT STYLE GITHUB - REPOSITORY ami-iit/casadi.git - TAG 3.6.5.backport3724 + REPOSITORY casadi/casadi.git + TAG 3.6.6 COMPONENT external FOLDER src CMAKE_ARGS -DWITH_IPOPT:BOOL=ON @@ -55,8 +55,4 @@ ycm_ep_helper(casadi TYPE GIT set(casadi_CONDA_PKG_NAME casadi) set(casadi_CONDA_PKG_CONDA_FORGE_OVERRIDE ON) -# This is a small hack. To avoid incompatibilities between the version tagged in the ami-iit fork -# and the version available in conda-forge when generating conda metapackages -# such as robotology-distro and robotology-distro-all, we override the conda package version of casadi -# here. This needs to be removed as soon as we stop use our fork in the superbuild -set(casadi_CONDA_VERSION 3.6.5) + diff --git a/cmake/ProjectsTagsStable.cmake b/cmake/ProjectsTagsStable.cmake index 5c1b3b930..4618bc448 100644 --- a/cmake/ProjectsTagsStable.cmake +++ b/cmake/ProjectsTagsStable.cmake @@ -11,8 +11,8 @@ set_tag(manif_TAG 0.0.5) set_tag(qhull_TAG 2020.2) set_tag(CppAD_TAG 20240000.2) set_tag(proxsuite_TAG v0.6.4) -set_tag(casadi_TAG 3.6.5.backport3724) -set_tag(casadi-matlab-bindings_TAG v3.6.5.0) +set_tag(casadi_TAG 3.6.6) +set_tag(casadi-matlab-bindings_TAG v3.6.6.0) # Robotology projects set_tag(YCM_TAG master) diff --git a/cmake/ProjectsTagsUnstable.cmake b/cmake/ProjectsTagsUnstable.cmake index e61654d32..98f7408ee 100644 --- a/cmake/ProjectsTagsUnstable.cmake +++ b/cmake/ProjectsTagsUnstable.cmake @@ -11,8 +11,8 @@ set_tag(manif_TAG 0.0.5) set_tag(qhull_TAG 2020.2) set_tag(CppAD_TAG 20240000.2) set_tag(proxsuite_TAG v0.6.4) -set_tag(casadi_TAG 3.6.5.backport3724) -set_tag(casadi-matlab-bindings_TAG v3.6.5.0) +set_tag(casadi_TAG 3.6.6) +set_tag(casadi-matlab-bindings_TAG v3.6.6) # Robotology projects set_tag(YARP_TAG yarp-3.9) diff --git a/releases/latest.releases.yaml b/releases/latest.releases.yaml index 00d6523a1..89da9aa8a 100644 --- a/releases/latest.releases.yaml +++ b/releases/latest.releases.yaml @@ -22,7 +22,7 @@ repositories: casadi: type: git url: https://github.com/casadi/casadi.git - version: 3.6.5 + version: 3.6.6 YCM: type: git url: https://github.com/robotology/ycm.git @@ -202,7 +202,7 @@ repositories: casadi-matlab-bindings: type: git url: https://github.com/ami-iit/casadi-matlab-bindings.git - version: v3.6.5.0 + version: v3.6.6 idyntree-yarp-tools: type: git url: https://github.com/robotology/idyntree-yarp-tools.git From abce468e2f2af4b54196e548ffbb73336c39d6de Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Mon, 16 Sep 2024 17:51:36 +0200 Subject: [PATCH 2/3] Update ProjectsTagsUnstable.cmake --- cmake/ProjectsTagsUnstable.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/ProjectsTagsUnstable.cmake b/cmake/ProjectsTagsUnstable.cmake index 98f7408ee..3f5758a63 100644 --- a/cmake/ProjectsTagsUnstable.cmake +++ b/cmake/ProjectsTagsUnstable.cmake @@ -12,7 +12,7 @@ set_tag(qhull_TAG 2020.2) set_tag(CppAD_TAG 20240000.2) set_tag(proxsuite_TAG v0.6.4) set_tag(casadi_TAG 3.6.6) -set_tag(casadi-matlab-bindings_TAG v3.6.6) +set_tag(casadi-matlab-bindings_TAG v3.6.6.0) # Robotology projects set_tag(YARP_TAG yarp-3.9) From 4855225180c5e425f00db5ec739d4e1c809082f5 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Mon, 16 Sep 2024 21:50:00 +0200 Subject: [PATCH 3/3] pixi-ci: Remove "-l {0}" that breaks pixi on macos-14 See https://github.com/prefix-dev/setup-pixi/issues/139 for the upstream issue --- .github/workflows/pixi-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pixi-ci.yml b/.github/workflows/pixi-ci.yml index f3e75c866..be896b5f9 100644 --- a/.github/workflows/pixi-ci.yml +++ b/.github/workflows/pixi-ci.yml @@ -42,7 +42,7 @@ jobs: - uses: prefix-dev/setup-pixi@v0.8.1 - name: Build - shell: bash -l {0} + shell: bash run: | # Avoid YCM complaining that the git user is not set # Eventually we could consider removing that check in YCM