Rebase from 'upstream'

CHANGELOG.rst

@@ -2,6 +2,12 @@
 Changelog for package nao_meshes
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.1.1 (2023-11-22)
+------------------
+* Download and install directly in bin dir
+* Update status badges
+* Contributors: Victor Paléologue
+
 2.1.0 (2023-11-15)
 ------------------
 * Workaround running installer in CI

CMakeLists.txt

@@ -6,7 +6,7 @@ find_package(ament_cmake REQUIRED)
 # When getting a new binay, the MD5 might change, and the folder hierarchy too
 # read comments below to adapt
 
-set(TMP_DIR ${CMAKE_CURRENT_BINARY_DIR}/tmp)
+set(TMP_DIR ${CMAKE_CURRENT_BINARY_DIR})
 set(INSTALLER_PATH ${TMP_DIR}/installer.run)
 
 if(${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "$i.86$")

README.md

@@ -1,6 +1,6 @@
 # nao_meshes2
 
-This package allows you to install the Aldebaran Pepper meshes for ROS2
+This package allows you to install the Aldebaran NAO meshes for ROS2
 
 When building a binary package, please make sure that with the installer the user has to agree to
 Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License
@@ -16,8 +16,7 @@ of the meshes as this could result in heavy cloning.
 
 ## Status
 
-ROS Distro | Binary Status | Source status |
-|-------------------|-------------------|-------------------|
-Humble | |
-Galactic | [![Build Status](https://build.ros2.org/job/Gbin_uF64__nao_meshes__ubuntu_focal_amd64__binary/badge/icon)](https://build.ros2.org/job/Gbin_uF64__nao_meshes__ubuntu_focal_amd64__binary/) | [![Build Status](https://build.ros2.org/job/Gsrc_uF__nao_meshes__ubuntu_focal__source/badge/icon)](https://build.ros2.org/job/Gsrc_uF__nao_meshes__ubuntu_focal__source/)
-Foxy | [![Build Status](https://build.ros2.org/job/Fbin_uF64__nao_meshes__ubuntu_focal_amd64__binary/badge/icon)](https://build.ros2.org/job/Fbin_uF64__nao_meshes__ubuntu_focal_amd64__binary/) | [![Build Status](https://build.ros2.org/job/Fsrc_uF__nao_meshes__ubuntu_focal__source/badge/icon)](https://build.ros2.org/job/Fsrc_uF__nao_meshes__ubuntu_focal__source/)
+ROS Distro | Binary Status | Source status | GitHub Status |
+|-------------------|-------------------|-------------------|--------------------|
+Humble | [![ros2-humble-jammy-bin-status-badge](https://build.ros2.org/job/Hbin_uJ64__nao_meshes__ubuntu_jammy_amd64__binary/badge/icon)](https://build.ros2.org/job/Hbin_uJ64__nao_meshes__ubuntu_jammy_amd64__binary) | [![ros2-humble-jammy-src-status-badge](https://build.ros2.org/job/Hsrc_uJ__nao_meshes__ubuntu_jammy__source/badge/icon)](https://build.ros2.org/job/Hsrc_uJ__nao_meshes__ubuntu_jammy__source) | [![ros2-humble-jammy](https://github.com/ros-naoqi/nao_meshes2/actions/workflows/humble_jammy.yml/badge.svg?branch=main)](https://github.com/ros-naoqi/nao_meshes2/actions/workflows/humble_jammy.yml)
+Iron | [![ros2-iron-jammy-bin-status-badge](https://build.ros2.org/job/Ibin_uJ64__nao_meshes__ubuntu_jammy_amd64__binary/badge/icon)](https://build.ros2.org/job/Ibin_uJ64__nao_meshes__ubuntu_jammy_amd64__binary) | [![ros2-iron-jammy-src-status-badge](https://build.ros2.org/job/Isrc_uJ__nao_meshes__ubuntu_jammy__source/badge/icon)](https://build.ros2.org/job/Isrc_uJ__nao_meshes__ubuntu_jammy__source) | [![ros2-iron-jammy](https://github.com/ros-naoqi/nao_meshes2/actions/workflows/iron_jammy.yml/badge.svg?branch=main)](https://github.com/ros-naoqi/nao_meshes2/actions/workflows/iron_jammy.yml)

package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="3">
   <name>nao_meshes</name>
-  <version>2.1.0</version>
+  <version>2.1.1</version>
   <description>ROS2 Meshes for the NAO robot</description>
   <author email="[email protected]">Maxime Busy</author>