From c90109a0a3b4d61c793cda1ca11a59b22fe9b730 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 12 Dec 2024 10:49:42 -0800
Subject: [PATCH 1/2] Bump nanoid from 3.3.7 to 3.3.8 in /docs (#354)

Bumps [nanoid](https://github.com/ai/nanoid) from 3.3.7 to 3.3.8.
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ai/nanoid/compare/3.3.7...3.3.8)

---
updated-dependencies:
- dependency-name: nanoid
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docs/package-lock.json | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/package-lock.json b/docs/package-lock.json
index 5741ac9..c4cba4c 100644
--- a/docs/package-lock.json
+++ b/docs/package-lock.json
@@ -14194,16 +14194,15 @@
       }
     },
     "node_modules/nanoid": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+      "version": "3.3.8",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
+      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
       "funding": [
         {
           "type": "github",
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "license": "MIT",
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },

From ab705d203ad36f1b3f01bd2b39df411a4ca3b559 Mon Sep 17 00:00:00 2001
From: Aaron Marburg <amarburg@uw.edu>
Date: Thu, 12 Dec 2024 23:35:15 -0800
Subject: [PATCH 2/2] Update Mavlink git repo, remove hot-patching of mavros
 and mavlink code (#358)

* Remove the sed-munging on mavlink and mavros

* Pin docker buildx to v0.18.0 in Github workflow
---
 .docker/Dockerfile            | 14 +-------------
 .github/workflows/docker.yaml |  6 ++++++
 2 files changed, 7 insertions(+), 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 \
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