Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update casadi to 3.6.6 and stop using ami-iit fork #1713

Merged
merged 3 commits into from
Sep 16, 2024
Merged

Update casadi to 3.6.6 and stop using ami-iit fork #1713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
11e6164
Update casadi to 3.6.6 and stop using ami-iit fork
traversaro Sep 16, 2024
abce468
Update ProjectsTagsUnstable.cmake
traversaro Sep 16, 2024
4855225
pixi-ci: Remove "-l {0}" that breaks pixi on macos-14
traversaro Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pixi-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- uses: prefix-dev/[email protected]

- 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
Expand Down
10 changes: 3 additions & 7 deletions cmake/Buildcasadi.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)

4 changes: 2 additions & 2 deletions cmake/ProjectsTagsStable.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions cmake/ProjectsTagsUnstable.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(YARP_TAG yarp-3.9)
Expand Down
4 changes: 2 additions & 2 deletions releases/latest.releases.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading