Skip to content

Commit

Permalink
Imported upstream version '1.1.14' of 'upstream'
Browse files Browse the repository at this point in the history
  • Loading branch information
rhaschke committed May 27, 2024
1 parent bb965c3 commit d4c0886
Show file tree
Hide file tree
Showing 206 changed files with 3,493 additions and 1,388 deletions.
12 changes: 7 additions & 5 deletions .docker/ci-testing/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .docker/ci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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") && \
Expand Down
4 changes: 2 additions & 2 deletions .docker/experimental/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ RUN git clone -b 26compat https://github.com/mongodb/mongo-cxx-driver.git && \
rm -rf /var/lib/apt/lists/*

# Download warehouse source
RUN wstool set -yu warehouse_ros_mongo --git https://github.com/ros-planning/warehouse_ros_mongo.git -v jade-devel && \
wstool set -yu warehouse_ros --git https://github.com/ros-planning/warehouse_ros.git -v jade-devel
RUN wstool set -yu warehouse_ros_mongo --git https://github.com/moveit/warehouse_ros_mongo.git -v jade-devel && \
wstool set -yu warehouse_ros --git https://github.com/moveit/warehouse_ros.git -v jade-devel

# build the workspace
RUN catkin build --limit-status-rate 0.001 --no-notify
2 changes: 1 addition & 1 deletion .docker/release/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
4 changes: 2 additions & 2 deletions .docker/source/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/first_timer_only.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ We're interested in helping you take the first step, and can answer questions an

We know that creating a pull request is the biggest barrier for new contributors. This issue is for you 💝

If you have contributed before, **consider leaving this PR for someone new**, and looking through our general [bug](https://github.com/ros-planning/moveit/labels/bug) issues. Thanks!
If you have contributed before, **consider leaving this PR for someone new**, and looking through our general [bug](https://github.com/moveit/moveit/labels/bug) issues. Thanks!

### 🤔 What you will need to know.

Expand Down Expand Up @@ -62,7 +62,7 @@ Don’t hesitate to ask questions or to get help if you feel like you are gettin

Furthermore, you find helpful resources here:
* [MoveIt FAQ](https://moveit.ros.org/documentation/faqs/)
* [MoveIt Tutorials](https://ros-planning.github.io/moveit_tutorials/)
* [MoveIt Tutorials](https://moveit.github.io/moveit_tutorials/)
* [MoveIt contribution guide](https://moveit.ros.org/documentation/contributing/)
* [ROS Tutorials](https://wiki.ros.org/ROS/Tutorials)
* [ROS Answers](https://answers.ros.org/questions/)
Expand Down
6 changes: 3 additions & 3 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ Please explain the changes you made, including a reference to the related issue
### Checklist
- [ ] **Required by CI**: Code is auto formatted using [clang-format](http://moveit.ros.org/documentation/contributing/code)
- [ ] Extend the tutorials / documentation [reference](http://moveit.ros.org/documentation/contributing/)
- [ ] Document API changes relevant to the user in the [MIGRATION.md](https://github.com/ros-planning/moveit/blob/master/MIGRATION.md) notes
- [ ] Create tests, which fail without this PR [reference](https://ros-planning.github.io/moveit_tutorials/doc/tests/tests_tutorial.html)
- [ ] Document API changes relevant to the user in the [MIGRATION.md](https://github.com/moveit/moveit/blob/master/MIGRATION.md) notes
- [ ] Create tests, which fail without this PR [reference](https://moveit.github.io/moveit_tutorials/doc/tests/tests_tutorial.html)
- [ ] Include a screenshot if changing a GUI
- [ ] While waiting for someone to review your request, please help review [another open pull request](https://github.com/ros-planning/moveit/pulls) to support the maintainers
- [ ] While waiting for someone to review your request, please help review [another open pull request](https://github.com/moveit/moveit/pulls) to support the maintainers

[//]: # "You can expect a response from a maintainer within 7 days. If you haven't heard anything by then, feel free to ping the thread. Thank you!"
12 changes: 6 additions & 6 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
CLANG_TIDY_ARGS: --fix --fix-errors --format-style=file
DOCKER_IMAGE: moveit/moveit:${{ matrix.env.IMAGE }}
UPSTREAM_WORKSPACE: .github/workflows/upstream.rosinstall
TARGET_WORKSPACE: $TARGET_REPO_PATH github:ros-planning/moveit_resources#master
TARGET_WORKSPACE: $TARGET_REPO_PATH github:moveit/moveit_resources#master
DOWNSTREAM_WORKSPACE: .github/workflows/downstream.rosinstall
# Pull any updates to the upstream workspace (after restoring it from cache)
AFTER_SETUP_UPSTREAM_WORKSPACE: vcs pull $BASEDIR/upstream_ws/src
Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
# free up a lot of stuff from /usr/local
sudo rm -rf /usr/local
df -h
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Cache upstream workspace
uses: rhaschke/cache@main
with:
Expand Down Expand Up @@ -135,7 +135,7 @@ jobs:
env: ${{ matrix.env }}

- name: Upload test artifacts (on failure)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure() && (steps.ici.outputs.run_target_test || steps.ici.outputs.target_test_results)
with:
name: test-results-${{ matrix.env.IMAGE }}
Expand All @@ -148,7 +148,7 @@ jobs:
workdir: ${{ env.BASEDIR }}/target_ws
ignore: '"*/target_ws/build/*" "*/target_ws/install/*" "*/test/*"'
- name: Upload codecov report
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
if: always() && matrix.env.CCOV && steps.ici.outputs.target_test_results == '0'
with:
files: ${{ env.BASEDIR }}/target_ws/coverage.info
Expand All @@ -170,11 +170,11 @@ jobs:
sync-noetic-devel:
runs-on: ubuntu-latest
needs: default # only trigger on success of default build job
if: github.event_name == 'push' && github.repository_owner == 'ros-planning' && github.ref == 'refs/heads/master'
if: github.event_name == 'push' && github.repository_owner == 'moveit' && github.ref == 'refs/heads/master'
permissions:
contents: write # allow pushing
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Fast-forward noetic-devel to sync with master
run: |
# Configure push user+url
Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
IMAGE: moveit/moveit:${{ matrix.ROS_DISTRO }}-${{ github.job }}

steps:
- uses: addnab/docker-run-action@v3
- uses: rhaschke/docker-run-action@v5
name: Check for apt updates
continue-on-error: true
id: apt
Expand All @@ -38,15 +38,15 @@ jobs:
have_updates=$(apt-get --simulate upgrade | grep -q "^0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.$" && echo false || echo true)
echo "no_cache=$have_updates" >> "$GITHUB_OUTPUT"
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
if: ${{ github.event_name == 'workflow_dispatch' || github.event_name != 'schedule' || steps.apt.outputs.no_cache }}
- name: Login to Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and Push
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
if: ${{ github.event_name == 'workflow_dispatch' || github.event_name != 'schedule' || steps.apt.outputs.no_cache }}
with:
file: .docker/${{ github.job }}/Dockerfile
Expand All @@ -71,7 +71,7 @@ jobs:
ROS_DISTRO: ${{ matrix.IMAGE == 'master' && 'melodic' || 'noetic' }}

steps:
- uses: addnab/docker-run-action@v3
- uses: rhaschke/docker-run-action@v5
name: Check for apt updates
continue-on-error: true
id: apt
Expand All @@ -82,15 +82,15 @@ jobs:
have_updates=$(apt-get --simulate upgrade | grep -q "^0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.$" && echo false || echo true)
echo "no_cache=$have_updates" >> "$GITHUB_OUTPUT"
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
if: ${{ github.event_name == 'workflow_dispatch' || github.event_name != 'schedule' || steps.apt.outputs.no_cache }}
- name: Login to Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and Push
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
if: ${{ github.event_name == 'workflow_dispatch' || github.event_name != 'schedule' || steps.apt.outputs.no_cache }}
with:
file: .docker/${{ github.job }}/Dockerfile
Expand All @@ -117,7 +117,7 @@ jobs:
IMAGE: moveit/moveit:${{ matrix.IMAGE }}-${{ github.job }}

steps:
- uses: addnab/docker-run-action@v3
- uses: rhaschke/docker-run-action@v5
name: Check for apt updates
continue-on-error: true
id: apt
Expand All @@ -128,15 +128,15 @@ jobs:
have_updates=$(apt-get --simulate upgrade | grep -q "^0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.$" && echo false || echo true)
echo "no_cache=$have_updates" >> "$GITHUB_OUTPUT"
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
if: ${{ github.event_name == 'workflow_dispatch' || github.event_name != 'schedule' || steps.apt.outputs.no_cache }}
- name: Login to Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and Push
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
if: ${{ github.event_name == 'workflow_dispatch' || github.event_name != 'schedule' || steps.apt.outputs.no_cache }}
with:
file: .docker/${{ github.job }}/Dockerfile
Expand All @@ -163,18 +163,18 @@ jobs:
IMAGE: moveit/moveit:${{ matrix.IMAGE }}-${{ github.job }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Login to Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: "Remove .dockerignore"
run: rm .dockerignore # enforce full source context
- name: Build and Push
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
file: .docker/${{ github.job }}/Dockerfile
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/downstream.rosinstall
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
version: master
- git:
local-name: moveit_visual_tools
uri: https://github.com/ros-planning/moveit_visual_tools.git
uri: https://github.com/moveit/moveit_visual_tools.git
version: master
- git:
local-name: moveit_tutorials
uri: https://github.com/ros-planning/moveit_tutorials.git
uri: https://github.com/moveit/moveit_tutorials.git
version: master
- git:
local-name: panda_moveit_config
uri: https://github.com/ros-planning/panda_moveit_config.git
uri: https://github.com/moveit/panda_moveit_config.git
version: noetic-devel
4 changes: 2 additions & 2 deletions .github/workflows/format.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prerelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ jobs:
# free up a lot of stuff from /usr/local
sudo rm -rf /usr/local
df -h
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: industrial_ci
uses: ros-industrial/industrial_ci@master
2 changes: 1 addition & 1 deletion .github/workflows/robostack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
os: [ubuntu-latest, macos-latest, windows-latest]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Build Dependencies
uses: mamba-org/provision-with-micromamba@v16
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/upstream.rosinstall
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
Loading

0 comments on commit d4c0886

Please sign in to comment.