Skip to content

Commit

Permalink
Use ignition-blueprint packages: msgs4, transport7
Browse files Browse the repository at this point in the history
Uses a custom branch of ignition-gui0 that supports dependencies
exclusively from the ignition-blueprint collection.
Updates installation instructions and CI.
  • Loading branch information
scpeters committed Dec 15, 2020
1 parent 9f1aabc commit 5c737f9
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 9 deletions.
4 changes: 4 additions & 0 deletions .github/dependencies.repos
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ repositories:
type: git
url: https://github.com/ToyotaResearchInstitute/ament_cmake_doxygen
version: master
ign-gui0:
type: git
url: https://github.com/scpeters/ign-gui
version: gui0_blueprint
pybind11:
type: git
url: https://github.com/RobotLocomotion/pybind11.git
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ jobs:
run: |
rosdep update;
rosdep install -i -y --rosdistro ${ROS_DISTRO} \
--skip-keys "ignition-transport5 ignition-msgs2 ignition-math6 ignition-common3 ignition-gui0 ignition-rendering2 libqt5multimedia5 pybind11" \
--skip-keys "ignition-transport7 ignition-msgs4 ignition-math6 ignition-common3 ignition-gui0 ignition-rendering2 libqt5multimedia5 pybind11" \
--from-paths src
- name: colcon build libraries
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sanitizers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ jobs:
run: |
rosdep update;
rosdep install -i -y --rosdistro ${ROS_DISTRO} \
--skip-keys "ignition-transport5 ignition-msgs2 ignition-math6 ignition-common3 ignition-gui0 ignition-rendering2 libqt5multimedia5 pybind11" \
--skip-keys "ignition-transport7 ignition-msgs4 ignition-math6 ignition-common3 ignition-gui0 ignition-rendering2 libqt5multimedia5 pybind11" \
--from-paths src
- name: colcon build libraries
shell: bash
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ applies.

```sh
rosdep update
rosdep install -i -y --rosdistro $ROS_DISTRO --skip-keys "ignition-transport5 ignition-msgs2 ignition-math6 ignition-common3 ignition-gui0 ignition-rendering2 libqt5multimedia5 pybind11" --from-paths src
rosdep install -i -y --rosdistro $ROS_DISTRO --skip-keys "ignition-transport7 ignition-msgs4 ignition-math6 ignition-common3 ignition-gui0 ignition-rendering2 libqt5multimedia5 pybind11" --from-paths src
```

Warning
Expand Down Expand Up @@ -261,7 +261,7 @@ necessary to build and execute. And we can easily inspect repositories.
4. To see if (most of) our versioned packages' dependencies have been met, run:

```sh
rosdep check --rosdistro $ROS_DISTRO --skip-keys "ignition-transport5 ignition-msgs2 ignition-math5 ignition-common2 ignition-gui0 ignition-rendering0 libqt5multimedia5 pybind11" --from-paths src
rosdep check --rosdistro $ROS_DISTRO --skip-keys "ignition-transport7 ignition-msgs4 ignition-math5 ignition-common2 ignition-gui0 ignition-rendering0 libqt5multimedia5 pybind11" --from-paths src
```

Note though that currently not all workspace prerequisites are nor can be dealt with using `rosdep`
Expand Down Expand Up @@ -501,7 +501,7 @@ your intended purpose.

```sh
rosdep update
rosdep install -i -y --rosdistro $ROS_DISTRO --skip-keys "ignition-transport5 ignition-msgs2 ignition-math6 ignition-common3 ignition-gui0 ignition-rendering2 libqt5multimedia5 pybind11" --from-paths /opt/dsim-desktop/*
rosdep install -i -y --rosdistro $ROS_DISTRO --skip-keys "ignition-transport7 ignition-msgs4 ignition-math6 ignition-common3 ignition-gui0 ignition-rendering2 libqt5multimedia5 pybind11" --from-paths /opt/dsim-desktop/*
```

6. When exiting the workspace, make sure changes are saved!
Expand Down
2 changes: 1 addition & 1 deletion ci/jenkins/install_deps
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ set -eo pipefail

rosdep update

sudo rosdep install -i -y --rosdistro=$ROS_DISTRO --skip-keys="ignition-transport5 ignition-msgs2 ignition-math6 ignition-common3 ignition-gui0 ignition-rendering2 libqt5multimedia5 pybind11" --from-paths src
sudo rosdep install -i -y --rosdistro=$ROS_DISTRO --skip-keys="ignition-transport7 ignition-msgs4 ignition-math6 ignition-common3 ignition-gui0 ignition-rendering2 libqt5multimedia5 pybind11" --from-paths src
6 changes: 3 additions & 3 deletions ignition.repos
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ repositories:
ign_tools : { type: 'git', url: 'https://github.com/ignitionrobotics/ign-tools.git', version: 'ign-tools0' }
ign_math : { type: 'git', url: 'https://github.com/ignitionrobotics/ign-math.git', version: 'ign-math6' }
ign_common : { type: 'git', url: 'https://github.com/ignitionrobotics/ign-common.git', version: 'ign-common3' }
ign_msgs : { type: 'git', url: 'https://github.com/ignitionrobotics/ign-msgs.git', version: 'ign-msgs2' }
ign_transport : { type: 'git', url: 'https://github.com/ignitionrobotics/ign-transport.git', version: 'ign-transport5' }
ign_msgs : { type: 'git', url: 'https://github.com/ignitionrobotics/ign-msgs.git', version: 'ign-msgs4' }
ign_transport : { type: 'git', url: 'https://github.com/ignitionrobotics/ign-transport.git', version: 'ign-transport7' }
ign_rendering : { type: 'git', url: 'https://github.com/ignitionrobotics/ign-rendering.git', version: 'ign-rendering2' }
ign_gui : { type: 'git', url: 'https://github.com/ignitionrobotics/ign-gui.git', version: 'ign-gui0' }
ign_gui0 : { type: 'git', url: 'https://github.com/scpeters/ign-gui.git', version: 'gui0_blueprint' }
ign_plugin : { type: 'git', url: 'https://github.com/ignitionrobotics/ign-plugin.git', version: 'ign-plugin1' }

0 comments on commit 5c737f9

Please sign in to comment.