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.

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

Ad nlohmann-json as dependency of the superbuild #776

Merged
merged 12 commits into from
Jun 6, 2021
Merged

Conversation

traversaro
Copy link
Member

@traversaro traversaro commented Jun 1, 2021

Fix #763 . I added it as a dependency in all points, I am just missing robotology/robotology-superbuild-dependencies-vcpkg#45 to also bump the version of vcpkg dependencies used in CI.

@traversaro
Copy link
Member Author

I am just missing robotology/robotology-superbuild-dependencies-vcpkg#45 to also bump the version of vcpkg dependencies used in CI.

This was fixed by de82b26 . As the vcpkg tarball has shown to be more stable lately, I switched CI to also use latest as originally suggested by @S-Dafarra, for consistency with the user docs.

@@ -406,6 +413,11 @@ jobs:
cd build
cmake -DROBOTOLOGY_ENABLE_DYNAMICS_FULL_DEPS:BOOL=OFF .

- name: Install dependencies unsupported in Ubuntu 18.04
if: contains(matrix.os, '20.04')
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the condition is different here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because it is for installing dependencies that are not available on 18.04, so it is run on Ubuntu 20.04 .

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I should have been more precise. I meant with respect to the similar if clause above at line 231

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I saw later that one applies to docker images and this to os. Not important at all

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I saw later that one applies to docker images and this to os. Not important at all

Yes, that's it. The clause are different as for the docker images you need to check the used docker image, not the base os.

@traversaro
Copy link
Member Author

The Conda/Linux CI failure are unrelated (see #785), I think once the other jobs finish we can merge.

@traversaro traversaro merged commit 116c9c7 into master Jun 6, 2021
@traversaro traversaro deleted the addjson branch June 6, 2021 08:30
Nicogene pushed a commit to Nicogene/robotology-superbuild that referenced this pull request Feb 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add nlohmann json to dependencies
2 participants