From 66a74d8eda88c7d97993eabcf4aab9b176e6612a Mon Sep 17 00:00:00 2001 From: VishGit1234 Date: Sat, 16 Nov 2024 23:53:40 +0000 Subject: [PATCH 1/3] Add carla msgs to foxglove dockerfile --- docker/infrastructure/foxglove/foxglove.Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/infrastructure/foxglove/foxglove.Dockerfile b/docker/infrastructure/foxglove/foxglove.Dockerfile index 2802819b..4ae96c17 100644 --- a/docker/infrastructure/foxglove/foxglove.Dockerfile +++ b/docker/infrastructure/foxglove/foxglove.Dockerfile @@ -8,6 +8,9 @@ WORKDIR ${AMENT_WS}/src # Copy in source code COPY src/wato_msgs wato_msgs +# Copy in CARLA messages +RUN git clone --depth 1 https://github.com/carla-simulator/ros-carla-msgs.git --branch 1.3.0 + # Scan for rosdeps RUN apt-get -qq update && rosdep update && \ rosdep install --from-paths . --ignore-src -r -s \ From 76653bd07b4329d8ed34a21d5178e03ab6edd572 Mon Sep 17 00:00:00 2001 From: VishGit1234 Date: Sun, 17 Nov 2024 00:54:03 +0000 Subject: [PATCH 2/3] fix ci failure --- docker/infrastructure/foxglove/foxglove.Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/infrastructure/foxglove/foxglove.Dockerfile b/docker/infrastructure/foxglove/foxglove.Dockerfile index 4ae96c17..a8d95176 100644 --- a/docker/infrastructure/foxglove/foxglove.Dockerfile +++ b/docker/infrastructure/foxglove/foxglove.Dockerfile @@ -10,6 +10,7 @@ COPY src/wato_msgs wato_msgs # Copy in CARLA messages RUN git clone --depth 1 https://github.com/carla-simulator/ros-carla-msgs.git --branch 1.3.0 +RUN rm ${AMENT_WS}/src/ros-carla-msgs/CONTRIBUTING.md # Scan for rosdeps RUN apt-get -qq update && rosdep update && \ From 03860dbb0ae48e701e7ee3ff3f93ff1ec649ed6a Mon Sep 17 00:00:00 2001 From: VishGit1234 Date: Sun, 17 Nov 2024 02:11:36 +0000 Subject: [PATCH 3/3] fix contributing.md --- docker/infrastructure/foxglove/foxglove.Dockerfile | 3 ++- src/wato_msgs/simulation/mit_contributing.txt | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 src/wato_msgs/simulation/mit_contributing.txt diff --git a/docker/infrastructure/foxglove/foxglove.Dockerfile b/docker/infrastructure/foxglove/foxglove.Dockerfile index a8d95176..9a5667ae 100644 --- a/docker/infrastructure/foxglove/foxglove.Dockerfile +++ b/docker/infrastructure/foxglove/foxglove.Dockerfile @@ -10,7 +10,8 @@ COPY src/wato_msgs wato_msgs # Copy in CARLA messages RUN git clone --depth 1 https://github.com/carla-simulator/ros-carla-msgs.git --branch 1.3.0 -RUN rm ${AMENT_WS}/src/ros-carla-msgs/CONTRIBUTING.md +# Update CONTRIBUTING.md to pass ament_copyright test +COPY src/wato_msgs/simulation/mit_contributing.txt ${AMENT_WS}/src/ros-carla-msgs/CONTRIBUTING.md # Scan for rosdeps RUN apt-get -qq update && rosdep update && \ diff --git a/src/wato_msgs/simulation/mit_contributing.txt b/src/wato_msgs/simulation/mit_contributing.txt new file mode 100644 index 00000000..9eee72fe --- /dev/null +++ b/src/wato_msgs/simulation/mit_contributing.txt @@ -0,0 +1,3 @@ +Any contribution that you make to this repository will +be under the MIT license, as dictated by that +[license](https://opensource.org/licenses/MIT).