diff --git a/.docker/ci/Dockerfile b/.docker/ci/Dockerfile index 484f2ab84f..61f4244f98 100644 --- a/.docker/ci/Dockerfile +++ b/.docker/ci/Dockerfile @@ -29,6 +29,12 @@ RUN \ ccache && \ # # Fetch all dependencies from moveit2.repos + # As of 5/2/2022, permissions need to be set explicitly. + # See https://github.com/actions/checkout/issues/760. + git config --global --add safe.directory /home/runner/work/moveit2/moveit2/.work/upstream_ws/src/geometric_shapes && \ + git config --global --add safe.directory /home/runner/work/moveit2/moveit2/.work/upstream_ws/src/moveit_resources && \ + git config --global --add safe.directory /home/runner/work/moveit2/moveit2/.work/upstream_ws/src/srdfdom && \ + # vcs import src < src/moveit2/moveit2.repos && \ if [ -r src/moveit2/moveit2_${ROS_DISTRO}.repos ] ; then vcs import src < src/moveit2/moveit2_${ROS_DISTRO}.repos ; fi && \ # diff --git a/.docker/source/Dockerfile b/.docker/source/Dockerfile index 153878f351..37d49dab1f 100644 --- a/.docker/source/Dockerfile +++ b/.docker/source/Dockerfile @@ -19,7 +19,14 @@ COPY . src/moveit2 RUN --mount=type=cache,target=/root/.ccache/ \ # Enable ccache PATH=/usr/lib/ccache:$PATH && \ - # Fetch required upstream sources for building + # + # Fetch all dependencies from moveit2.repos + # As of 5/2/2022, permissions need to be set explicitly. + # See https://github.com/actions/checkout/issues/760. + git config --global --add safe.directory /home/runner/work/moveit2/moveit2/.work/upstream_ws/src/geometric_shapes && \ + git config --global --add safe.directory /home/runner/work/moveit2/moveit2/.work/upstream_ws/src/moveit_resources && \ + git config --global --add safe.directory /home/runner/work/moveit2/moveit2/.work/upstream_ws/src/srdfdom && \ + # vcs import src < src/moveit2/moveit2.repos && \ if [ -r src/moveit2/moveit2_${ROS_DISTRO}.repos ] ; then vcs import src < src/moveit2/moveit2_${ROS_DISTRO}.repos ; fi && \ # diff --git a/moveit_core/trajectory_processing/test/test_ruckig_traj_smoothing.cpp b/moveit_core/trajectory_processing/test/test_ruckig_traj_smoothing.cpp index 1a2b1f69b4..07fee76ef6 100644 --- a/moveit_core/trajectory_processing/test/test_ruckig_traj_smoothing.cpp +++ b/moveit_core/trajectory_processing/test/test_ruckig_traj_smoothing.cpp @@ -98,7 +98,7 @@ TEST_F(RuckigTests, trajectory_duration) EXPECT_TRUE( smoother_.applySmoothing(*trajectory_, 1.0 /* max vel scaling factor */, 1.0 /* max accel scaling factor */)); EXPECT_GT(trajectory_->getWayPointDurationFromStart(trajectory_->getWayPointCount() - 1), 0.9999 * ideal_duration); - EXPECT_LT(trajectory_->getWayPointDurationFromStart(trajectory_->getWayPointCount() - 1), 1.3 * ideal_duration); + EXPECT_LT(trajectory_->getWayPointDurationFromStart(trajectory_->getWayPointCount() - 1), 1.5 * ideal_duration); } TEST_F(RuckigTests, single_waypoint)