From 406ae30ed0bbf94531a955791f5bc2bd53cba0e0 Mon Sep 17 00:00:00 2001 From: Christian Rauch Date: Fri, 31 May 2024 07:57:35 +0200 Subject: [PATCH 1/4] add apriltag library as source build dependency --- .github/deps.repos | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/deps.repos b/.github/deps.repos index ac563c6..2010fe0 100644 --- a/.github/deps.repos +++ b/.github/deps.repos @@ -1,4 +1,9 @@ repositories: + src/apriltag: + type: git + url: https://github.com/AprilRobotics/apriltag.git + version: v3.4.2 src/apriltag_msgs: type: git url: https://github.com/christianrauch/apriltag_msgs.git + version: 2.0.1 From 06debf66e4b783c752c690f1451c17c79295d723 Mon Sep 17 00:00:00 2001 From: Christian Rauch Date: Fri, 31 May 2024 08:04:54 +0200 Subject: [PATCH 2/4] add missing 'functional' header --- src/pose_estimation.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pose_estimation.hpp b/src/pose_estimation.hpp index 7ba1654..5913a99 100644 --- a/src/pose_estimation.hpp +++ b/src/pose_estimation.hpp @@ -1,6 +1,7 @@ #pragma once #include +#include #include #include From 335087d50b692ba1a0735cb50c775b89b78308d5 Mon Sep 17 00:00:00 2001 From: Christian Rauch Date: Fri, 31 May 2024 07:58:05 +0200 Subject: [PATCH 3/4] test ROS "jazzy" on Ubuntu 24.04 --- .github/workflows/ci.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index db2c9c4..39979fe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,8 +7,14 @@ jobs: name: apriltag_ros runs-on: ubuntu-latest + strategy: + matrix: + include: + - {ubuntu: "22.04", ros: humble} + - {ubuntu: "24.04", ros: jazzy} + container: - image: ubuntu:22.04 + image: ubuntu:${{ matrix.ubuntu }} steps: - uses: actions/checkout@v4 @@ -18,5 +24,5 @@ jobs: - uses: ros-tooling/action-ros-ci@v0.3 with: package-name: apriltag_ros - target-ros2-distro: humble + target-ros2-distro: ${{ matrix.ros }} vcs-repo-file-url: .github/deps.repos From e98dade0dbbef0f9cd99271c284493c917a32e05 Mon Sep 17 00:00:00 2001 From: Christian Rauch Date: Fri, 31 May 2024 08:06:22 +0200 Subject: [PATCH 4/4] bump patch version --- package.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.xml b/package.xml index 44c7abc..4ee39a4 100644 --- a/package.xml +++ b/package.xml @@ -2,7 +2,7 @@ apriltag_ros - 3.2.0 + 3.2.1 AprilTag detection node Christian Rauch MIT