-
Notifications
You must be signed in to change notification settings - Fork 1
Upgrade from Iron to Jazzy #15
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
Merged
Merged
Changes from 12 commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
4468222
Added Jazzy and virtualenv configurations
evan-palmer 4ca5646
Testing groups
evan-palmer e00f778
Fixed gid and pip
evan-palmer 50cd0bb
Fixed venv install
evan-palmer fa8e7ca
Another attempt
evan-palmer 1c760d9
Using ros binary install for gazebo
evan-palmer deef360
Testing ubuntu user
evan-palmer 950f561
Adding ubuntu to sudoers list
evan-palmer 8517749
Fixed cpp compiler install
evan-palmer a8ea66f
Added venv to path
evan-palmer b1fce6c
Fix python version in ruff config
evan-palmer d6de403
Switched back to main for pipelines
evan-palmer ffbe7c7
Addressed PR comments
evan-palmer 5370b20
Attempt at fixing format workflow
evan-palmer 9e68f5e
Update to use 24.04 runner
evan-palmer 178e0a5
Addressed comment about codespell config
evan-palmer 2b2748a
removed unneccessary flag
evan-palmer 44ca677
Removed apt update
evan-palmer File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
[codespell] | ||
# Uncomment/populate the following so that codespell ignores the specified words | ||
# skip = *.json | ||
# ignore-words-list = example,words,to,ignore |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,27 +1,36 @@ | ||
FROM ghcr.io/robotic-decision-making-lab/ros2-template:iron-desktop | ||
FROM ghcr.io/robotic-decision-making-lab/ros2-template:jazzy-desktop | ||
|
||
# Install ROS dependencies | ||
# This is done in a previous stage, but we include it again here in case anyone wants to | ||
# add new dependencies during development | ||
ENV USERNAME=ros | ||
ENV USER_WORKSPACE=/home/$USERNAME/ws_ros | ||
WORKDIR $USER_WORKSPACE | ||
|
||
COPY --chown=$USER_UID:$USER_GID . src/$PROJECT_NAME | ||
|
||
RUN sudo apt-get -q update \ | ||
&& sudo apt-get -q -y upgrade \ | ||
&& rosdep update \ | ||
&& rosdep install -y --from-paths . --ignore-src -r --rosdistro ${ROS_DISTRO} \ | ||
&& rosdep install -y --from-paths . --ignore-src -r --as-root=pip:false --rosdistro ${ROS_DISTRO} \ | ||
&& sudo apt-get autoremove -y \ | ||
&& sudo apt-get clean -y \ | ||
&& sudo rm -rf /var/lib/apt/lists/* | ||
|
||
# Install debugging/linting Python packages | ||
COPY --chown=$USER_UID:$USER_GID requirements-dev.txt . | ||
RUN python3 -m pip install -r requirements-dev.txt \ | ||
RUN pip install -r requirements-dev.txt \ | ||
&& rm -rf requirements-dev.txt | ||
|
||
# Install debugging/linting C++ packages | ||
RUN sudo apt-get -q update \ | ||
&& sudo apt-get -q -y upgrade \ | ||
&& sudo apt-get install -y \ | ||
clang-format-18 \ | ||
clang-tidy \ | ||
clang-tools \ | ||
&& sudo apt-get autoremove -y \ | ||
&& sudo apt-get clean -y \ | ||
&& sudo rm -rf /var/lib/apt/lists/* | ||
|
||
# Disable the setuputils installation warning | ||
# This prevents us from needing to pin the setuputils version (which doesn't always work) | ||
ENV PYTHONWARNINGS="ignore" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,27 +1,36 @@ | ||
FROM ghcr.io/robotic-decision-making-lab/ros2-template:iron-desktop-nvidia | ||
FROM ghcr.io/robotic-decision-making-lab/ros2-template:jazzy-desktop-nvidia | ||
|
||
# Install ROS dependencies | ||
# This is done in a previous stage, but we include it again here in case anyone wants to | ||
# add new dependencies during development | ||
ENV USERNAME=ros | ||
ENV USER_WORKSPACE=/home/$USERNAME/ws_ros | ||
WORKDIR $USER_WORKSPACE | ||
|
||
COPY --chown=$USER_UID:$USER_GID . src/$PROJECT_NAME | ||
|
||
RUN sudo apt-get -q update \ | ||
&& sudo apt-get -q -y upgrade \ | ||
&& rosdep update \ | ||
&& rosdep install -y --from-paths . --ignore-src -r --rosdistro ${ROS_DISTRO} \ | ||
&& rosdep install -y --from-paths . --ignore-src -r --as-root=pip:false --rosdistro ${ROS_DISTRO} \ | ||
&& sudo apt-get autoremove -y \ | ||
evan-palmer marked this conversation as resolved.
Show resolved
Hide resolved
|
||
&& sudo apt-get clean -y \ | ||
&& sudo rm -rf /var/lib/apt/lists/* | ||
|
||
# Install debugging/linting Python packages | ||
COPY --chown=$USER_UID:$USER_GID requirements-dev.txt . | ||
RUN python3 -m pip install -r requirements-dev.txt \ | ||
RUN pip install -r requirements-dev.txt \ | ||
&& rm -rf requirements-dev.txt | ||
|
||
evan-palmer marked this conversation as resolved.
Show resolved
Hide resolved
|
||
# Install debugging/linting C++ packages | ||
RUN sudo apt-get -q update \ | ||
&& sudo apt-get -q -y upgrade \ | ||
&& sudo apt-get install -y \ | ||
clang-format-18 \ | ||
clang-tidy \ | ||
clang-tools \ | ||
&& sudo apt-get autoremove -y \ | ||
&& sudo apt-get clean -y \ | ||
&& sudo rm -rf /var/lib/apt/lists/* | ||
|
||
# Disable the setuputils installation warning | ||
# This prevents us from needing to pin the setuputils version (which doesn't always work) | ||
ENV PYTHONWARNINGS="ignore" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,3 +2,6 @@ | |
build | ||
install | ||
log | ||
|
||
# virtualenv | ||
.venv |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
target-version = "py310" | ||
target-version = "py312" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.