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

Jump to bottom

Patches and doc for GzHarmonic ros_gz creation #1003

Merged
merged 4 commits into from
Oct 2, 2023
Merged

Patches and doc for GzHarmonic ros_gz creation #1003

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
def8aa1
WIP in conflicting versions
j-rivero Aug 31, 2023
1f06752
Complete README with custom RELEASE_REPO_URL
j-rivero Aug 31, 2023
b0e7884
Fix problems with renaming different Gazebo distros
j-rivero Aug 31, 2023
c258350
Add the list of active releases
j-rivero Sep 18, 2023
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
8 changes: 4 additions & 4 deletions bloom/ros_gz/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ RUN apt-get update && apt-get install -y \
wget \
&& rm -rf /var/lib/apt/lists/*

# Install osrf-rosdep for Gazebo distributions not in ROS
# Install osrf-rosdep for Gazebo distributions not in ROS.
# Note that 01 is important to give priority to the replace list below
RUN sudo bash -c \
'wget https://raw.githubusercontent.com/osrf/osrf-rosdep/master/gz/00-gazebo.list -O /etc/ros/rosdep/sources.list.d/00-gazebo.list'
# Replace url
# since it does not support arbitrary environment variables
'wget https://raw.githubusercontent.com/osrf/osrf-rosdep/master/gz/00-gazebo.list -O /etc/ros/rosdep/sources.list.d/01-gazebo.list'
# Bloom does not support environment vars, use the trick or replacing one rosdep keys by others
RUN sudo bash -c \
"wget $URL_OSRF_ROSDEP_REPLACE -O /etc/ros/rosdep/sources.list.d/00-replace-gz.list"

Expand Down
13 changes: 13 additions & 0 deletions bloom/ros_gz/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,19 @@ package name.
- Usage: `$ rename-ros_gz-pkgs.bash <desired_gz_version> <space separted list of rosdistros to release>`
- Example: `$ rename-ros_gz-pkgs.bash garden humble`

The script supports to inject a custom RELEASE_REPO_URL that points to a bloom gbp
repository different than https://github.com/gazebo-release/ros_ign-release.
Copy link
Contributor

Choose a reason for hiding this comment

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

This is just an example right? The repo is not supposed to exist already

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The repo exists and host humble metadata for Garden. See the tabel in line 30 in this same document.


```
i.e use a https://github.com/gazebo-testing/ros_ign-gzharmonic-release as gbp testing repository

RELEASE_REPO_URL=https://github.com/gazebo-testing/ros_ign-gzharmonic-release \
./bloom_from_special_env.bash \
humble \
garden \
https://raw.githubusercontent.com/osrf/osrf-rosdep/master/gz/replace_fortress_with_garden/00-replace-gz-fortress-with-garden.list
```


### 2.2 Create a custom track in tracks.yml

Expand Down
4 changes: 3 additions & 1 deletion bloom/ros_gz/rename-ros_gz-pkgs.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ for pkg in ${PKGS}; do
git commit debian/control.em debian/changelog.em -m "Patch name to release ${GZ_RELEASE} version"
# Include conflict with initial package name in ROS
sed -i -e '/^Depends/a\Conflicts: \@(Package)' debian/control.em

if [[ -n ${GZ_RELEASE_TO_CONFLICT} ]]; then
sed -i -e "s/Conflicts: @(Package)/Conflicts: @(Package.replace('-gz','-gz${GZ_RELEASE_TO_CONFLICT}'))/" debian/control.em
fi
git commit debian/control.em -m "Set up a conflict with official ROS packages"
git push origin "debian/$distro/$pkg"
done
Expand Down