From a1b5adc1469d370672e3a05cfdf427b9560b073f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Victor=20Pal=C3=A9ologue?= Date: Wed, 22 Nov 2023 11:13:15 +0100 Subject: [PATCH] Rebase from 'upstream' --- CHANGELOG.rst | 6 ++++++ CMakeLists.txt | 2 +- README.md | 11 +++++------ package.xml | 2 +- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e1d93b9..a05bfac 100644 --- a/CHANGELOG.rst +++ b/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 diff --git a/CMakeLists.txt b/CMakeLists.txt index a40af7d..1b0f56d 100644 --- a/CMakeLists.txt +++ b/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$") diff --git a/README.md b/README.md index 947b14f..3ee4bf5 100644 --- a/README.md +++ b/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) diff --git a/package.xml b/package.xml index 2fc3325..55b9eb3 100644 --- a/package.xml +++ b/package.xml @@ -1,7 +1,7 @@ nao_meshes - 2.1.0 + 2.1.1 ROS2 Meshes for the NAO robot Maxime Busy