Skip to content

Commit

Permalink
Merge pull request #324 from christian-rauch/jazzy
Browse files Browse the repository at this point in the history
prepare for ROS "Jazzy"
  • Loading branch information
christian-rauch authored May 12, 2024
2 parents 7dcb86d + 8421879 commit abf7d58
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
11 changes: 8 additions & 3 deletions .github/workflows/colcon-workspace.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ jobs:

strategy:
matrix:
ros_distribution: [noetic, humble]
include:
- docker_image: ubuntu:20.04
ros_distribution: noetic
Expand All @@ -21,6 +20,10 @@ jobs:
ros_distribution: humble
ros_version: 2

- docker_image: ubuntu:24.04
ros_distribution: jazzy
ros_version: 2

container:
image: ${{ matrix.docker_image }}

Expand Down Expand Up @@ -58,14 +61,16 @@ jobs:

strategy:
matrix:
ros_distribution: [noetic, humble]
include:
- ros_distribution: noetic
ros_version: 1

- ros_distribution: humble
ros_version: 2

- ros_distribution: jazzy
ros_version: 2

steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -96,7 +101,7 @@ jobs:

strategy:
matrix:
ros_distribution: [humble]
ros_distribution: [humble, jazzy]

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.16)
project(apriltag VERSION 3.4.0 LANGUAGES C)
project(apriltag VERSION 3.4.1 LANGUAGES C)

if(POLICY CMP0077)
cmake_policy(SET CMP0077 NEW)
Expand Down
2 changes: 1 addition & 1 deletion package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>apriltag</name>
<version>3.4.0</version>
<version>3.4.1</version>
<description>AprilTag detector library</description>

<maintainer email="[email protected]">Max Krogius</maintainer>
Expand Down

0 comments on commit abf7d58

Please sign in to comment.