-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Imported upstream version '1.1.14' of 'upstream'
- Loading branch information
Showing
206 changed files
with
3,493 additions
and
1,388 deletions.
There are no files selected for viewing
This file contains 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 |
---|---|---|
|
@@ -3,13 +3,15 @@ | |
|
||
ARG IMAGE=noetic | ||
FROM moveit/moveit:${IMAGE}-ci | ||
MAINTAINER Robert Haschke [email protected] | ||
LABEL org.opencontainers.image.authors="Robert Haschke <[email protected]>" | ||
|
||
# Switch to ros-testing | ||
RUN echo "deb http://packages.ros.org/ros-testing/ubuntu `lsb_release -cs` main" | tee /etc/apt/sources.list.d/ros1-latest.list | ||
|
||
# Upgrade packages to ros-testing and clean apt-cache within one RUN command | ||
RUN apt-get -qq update && \ | ||
RUN apt-get update && \ | ||
apt-get install curl && \ | ||
curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg && \ | ||
echo "deb [signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros-testing/ubuntu `lsb_release -cs` main" | tee /etc/apt/sources.list.d/ros1-latest.list && \ | ||
# Upgrade packages to ros-testing and clean apt-cache within one RUN command | ||
apt-get update && \ | ||
apt-get -qq -y dist-upgrade && \ | ||
# | ||
# Clear apt-cache to reduce image size | ||
|
This file contains 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 |
---|---|---|
|
@@ -3,7 +3,7 @@ | |
|
||
ARG ROS_DISTRO=noetic | ||
FROM ros:${ROS_DISTRO}-ros-base | ||
MAINTAINER Dave Coleman [email protected] | ||
LABEL org.opencontainers.image.authors="Robert Haschke <[email protected]>" | ||
|
||
ENV TERM xterm | ||
|
||
|
@@ -31,7 +31,7 @@ RUN \ | |
# | ||
# Download MoveIt sources, so that we can fetch all necessary dependencies | ||
wstool init --shallow src src/moveit/.github/workflows/upstream.rosinstall && \ | ||
git clone --depth 1 --branch master https://github.com/ros-planning/moveit_resources src/moveit_resources && \ | ||
git clone --depth 1 --branch master https://github.com/moveit/moveit_resources src/moveit_resources && \ | ||
# | ||
# Download all dependencies of MoveIt | ||
rosdep update $(test "${ROS_DISTRO}" = "melodic" && echo "--include-eol-distros") && \ | ||
|
This file contains 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 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,7 +2,7 @@ | |
|
||
ARG ROS_DISTRO=noetic | ||
FROM ros:${ROS_DISTRO}-ros-base | ||
MAINTAINER Dave Coleman [email protected] | ||
LABEL org.opencontainers.image.authors="Robert Haschke <[email protected]>" | ||
|
||
# Commands are combined in single RUN statement with "apt/lists" folder removal to reduce image size | ||
RUN apt-get update -q && \ | ||
|
This file contains 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 |
---|---|---|
|
@@ -5,7 +5,7 @@ | |
|
||
ARG IMAGE=noetic | ||
FROM moveit/moveit:${IMAGE}-ci-testing | ||
MAINTAINER Robert Haschke [email protected] | ||
LABEL org.opencontainers.image.authors="Robert Haschke <[email protected]>" | ||
|
||
ENV PYTHONIOENCODING UTF-8 | ||
# Export ROS_UNDERLAY for downstream docker containers | ||
|
@@ -24,7 +24,7 @@ RUN --mount=type=cache,target=/root/.ccache/ \ | |
PATH=/usr/lib/ccache:$PATH && \ | ||
# Fetch required upstream sources for building | ||
wstool init --shallow src src/moveit/.github/workflows/upstream.rosinstall && \ | ||
git clone --depth 1 --branch master https://github.com/ros-planning/moveit_resources src/moveit_resources && \ | ||
git clone --depth 1 --branch master https://github.com/moveit/moveit_resources src/moveit_resources && \ | ||
# | ||
catkin config --extend /opt/ros/$ROS_DISTRO --install --cmake-args -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMMANDS=ON && \ | ||
# Status rate is limited so that just enough info is shown to keep Docker from timing out, | ||
|
This file contains 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 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 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 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 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 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 |
---|---|---|
|
@@ -16,11 +16,11 @@ jobs: | |
name: pre-commit | ||
runs-on: ubuntu-20.04 | ||
steps: | ||
- uses: actions/checkout@v3 | ||
- uses: actions/checkout@v4 | ||
- name: Install clang-format-10 | ||
run: sudo apt-get install clang-format-10 | ||
- uses: rhaschke/[email protected] | ||
- uses: pre-commit/[email protected].0 | ||
- uses: pre-commit/[email protected].1 | ||
id: precommit | ||
- name: Upload pre-commit changes | ||
if: failure() && steps.precommit.outcome == 'failure' | ||
|
This file contains 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 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 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,12 +1,12 @@ | ||
- git: | ||
local-name: moveit_msgs | ||
uri: https://github.com/ros-planning/moveit_msgs.git | ||
uri: https://github.com/moveit/moveit_msgs.git | ||
version: master | ||
- git: | ||
local-name: geometric_shapes | ||
uri: https://github.com/ros-planning/geometric_shapes.git | ||
uri: https://github.com/moveit/geometric_shapes.git | ||
version: noetic-devel | ||
- git: | ||
local-name: srdfdom | ||
uri: https://github.com/ros-planning/srdfdom | ||
uri: https://github.com/moveit/srdfdom | ||
version: noetic-devel |
Oops, something went wrong.