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

Fix wrong name of qpOASES_CONDA_VERSION variable and remove hardcoding step of qpoases build useless since we switch to use qpOASES binary from conda-forge #1085

Merged
merged 2 commits into from
Apr 6, 2022
Merged

Fix wrong name of qpOASES_CONDA_VERSION variable and remove hardcoding step of qpoases build useless since we switch to use qpOASES binary from conda-forge #1085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31b054e
Fix wrong name of qpOASES_CONDA_VERSION variable
traversaro Apr 5, 2022
55e9603
Update generate-conda-packages.yaml
traversaro Apr 5, 2022
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: 0 additions & 2 deletions .github/workflows/generate-conda-packages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,6 @@ jobs:
rm -rf icub-main
conda mambabuild -m ${CONDA_PREFIX}/conda_build_config.yaml -m ${GITHUB_WORKSPACE}/conda/conda_build_config.yml lie-group-controllers
rm -rf lie-group-controllers
conda mambabuild -m ${CONDA_PREFIX}/conda_build_config.yaml -m ${GITHUB_WORKSPACE}/conda/conda_build_config.yml qpoases
rm -rf qpoases
conda mambabuild -m ${CONDA_PREFIX}/conda_build_config.yaml -m ${GITHUB_WORKSPACE}/conda/conda_build_config.yml yarp-matlab-bindings
rm -rf yarp-matlab-bindings
conda mambabuild -m ${CONDA_PREFIX}/conda_build_config.yaml -m ${GITHUB_WORKSPACE}/conda/conda_build_config.yml wb-toolbox
Expand Down
2 changes: 1 addition & 1 deletion cmake/BuildqpOASES.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ set(qpOASES_CONDA_PKG_CONDA_FORGE_OVERRIDE ON)
# (something like 3.2.0.1) 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 qpOASES
# here. This needs to be removed as soon as we stop use our fork in the superbuild
set(casadi_CONDA_VERSION 3.2.1)
set(qpOASES_CONDA_VERSION 3.2.1)