Update Mavlink git repo, remove hot-patching of mavros and mavlink code (#358) (#359)

* Remove the sed-munging on mavlink and mavros

* Pin docker buildx to v0.18.0 in Github workflow

(cherry picked from commit ab705d2)

Co-authored-by: Aaron Marburg <[email protected]>

Author: mergify[bot]

.docker/Dockerfile

@@ -114,19 +114,7 @@ ARG MAVROS_RELEASE=ros2
 # mavlink-gdp-release has not been released for Jazzy, so we use the Rolling release
 ARG MAVLINK_RELEASE=release/rolling/mavlink
 RUN git clone --depth 1 -b ${MAVROS_RELEASE} https://github.com/mavlink/mavros.git
-RUN git clone --depth 1 --recursive -b ${MAVLINK_RELEASE} https://github.com/mavlink/mavlink-gbp-release.git mavlink
-# - mavgen uses future.standard_library for backwards compatibility with Python2;
-#   However, this caused issues with Python 3.12 installed in "noble".
-#   Comment those lines out in mavlink.
-#
-# - Fix linkage for yaml-cpp in mavros_extra_plugins
-RUN sed -i -e 's/^from future import standard_library/#from future import standard_library/' \
-    -e 's/standard_library.install_aliases()/#standard_library.install_aliases()/' \
-    mavlink/pymavlink/generator/mavgen.py && \
-    sed -i -e 's/^# find_package(yaml_cpp REQUIRED)/find_package(yaml-cpp REQUIRED)/' \
-    -e '/^ament_target_dependencies(mavros_extras_plugins$/i target_link_libraries(mavros_extras_plugins yaml-cpp::yaml-cpp)' \
-    -e '/^ament_target_dependencies(mavros_extras$/i target_link_libraries(mavros_extras yaml-cpp::yaml-cpp)' \
-    mavros/mavros_extras/CMakeLists.txt
+RUN git clone --depth 1 --recursive -b ${MAVLINK_RELEASE} https://github.com/ros2-gbp/mavlink-gbp-release.git mavlink
 
 WORKDIR $USER_WORKSPACE
 RUN sudo apt-get -q update \

.github/workflows/docker.yaml

@@ -38,6 +38,12 @@ jobs:
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
+        with:
+          # Pin docker-buildx to this version for now
+          #  v0.19.2 has issues with empty keys,
+          #  particularly the "*.cache-to=" used below
+          #
+          version: v0.18.0
 
       - if: env.PUSH == 'true'
         name: Log into registry