From 4c4d00364ca9f75e359b61576048ab173e30dfe9 Mon Sep 17 00:00:00 2001 From: Aaron Marburg Date: Wed, 11 Dec 2024 12:27:03 -0800 Subject: [PATCH 1/2] Remove the sed-munging on mavlink and mavros --- .docker/Dockerfile | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 81ef2e4..9f38a9e 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -113,19 +113,7 @@ WORKDIR $USER_WORKSPACE/src/ ARG MAVROS_RELEASE=ros2 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 \ From 362baa8e1285fc0672bea1650348b6ecdd56a48b Mon Sep 17 00:00:00 2001 From: Aaron Marburg Date: Thu, 12 Dec 2024 17:38:11 -0800 Subject: [PATCH 2/2] Pin docker buildx to v0.18.0 in Github workflow --- .github/workflows/docker.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index bd903c8..04d3829 100644 --- a/.github/workflows/docker.yaml +++ b/.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