From cfa82ac4e4ad842e3bda6563db0a78a69c75fdff Mon Sep 17 00:00:00 2001 From: Ryan Liao Date: Sun, 28 Jun 2026 07:21:32 -0400 Subject: [PATCH 1/4] Reintroduce library_path.sh patches from humble --- patch/ros-rolling-ament-cmake-core.patch | 18 ++++++++++++++++++ patch/ros-rolling-ament-package.patch | 22 ++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 patch/ros-rolling-ament-cmake-core.patch create mode 100644 patch/ros-rolling-ament-package.patch diff --git a/patch/ros-rolling-ament-cmake-core.patch b/patch/ros-rolling-ament-cmake-core.patch new file mode 100644 index 00000000..555f3fc9 --- /dev/null +++ b/patch/ros-rolling-ament-cmake-core.patch @@ -0,0 +1,18 @@ +diff --git a/cmake/package_templates/templates_2_cmake.py b/cmake/package_templates/templates_2_cmake.py +index b7c0faf..328cc38 100644 +--- a/cmake/package_templates/templates_2_cmake.py ++++ b/cmake/package_templates/templates_2_cmake.py +@@ -68,12 +68,7 @@ def generate_cmake_code(): + """ + variables = [] + +- if not IS_WINDOWS: +- variables.append(( +- 'ENVIRONMENT_HOOK_LIBRARY_PATH', +- '"%s"' % get_environment_hook_template_path('library_path.sh'))) +- else: +- variables.append(('ENVIRONMENT_HOOK_LIBRARY_PATH', '')) ++ variables.append(('ENVIRONMENT_HOOK_LIBRARY_PATH', '')) + + ext = '.bat.in' if IS_WINDOWS else '.sh.in' + variables.append(( diff --git a/patch/ros-rolling-ament-package.patch b/patch/ros-rolling-ament-package.patch new file mode 100644 index 00000000..ae032894 --- /dev/null +++ b/patch/ros-rolling-ament-package.patch @@ -0,0 +1,22 @@ +diff --git a/ament_package/template/environment_hook/library_path.sh b/ament_package/template/environment_hook/library_path.sh +deleted file mode 100644 +index 292e518..0000000 +--- a/ament_package/template/environment_hook/library_path.sh ++++ /dev/null +@@ -1,16 +0,0 @@ +-# copied from ament_package/template/environment_hook/library_path.sh +- +-# detect if running on Darwin platform +-_UNAME=`uname -s` +-_IS_DARWIN=0 +-if [ "$_UNAME" = "Darwin" ]; then +- _IS_DARWIN=1 +-fi +-unset _UNAME +- +-if [ $_IS_DARWIN -eq 0 ]; then +- ament_prepend_unique_value LD_LIBRARY_PATH "$AMENT_CURRENT_PREFIX/lib" +-else +- ament_prepend_unique_value DYLD_LIBRARY_PATH "$AMENT_CURRENT_PREFIX/lib" +-fi +-unset _IS_DARWIN From 52d8ef3396f667477f9ee81e291718c6e4ce959d Mon Sep 17 00:00:00 2001 From: Ryan Liao Date: Tue, 30 Jun 2026 05:28:44 -0400 Subject: [PATCH 2/4] Bump vinca for full rebuild --- .github/workflows/testpr.yml | 2 +- vinca.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/testpr.yml b/.github/workflows/testpr.yml index 67557768..9c6bbb15 100644 --- a/.github/workflows/testpr.yml +++ b/.github/workflows/testpr.yml @@ -7,7 +7,7 @@ env: # Change to 'true' to enable the cache upload as artifacts SAVE_CACHE_AS_ARTIFACT: 'true' # Change to 'true' to ignore cache and force a full rebuild, but please restore to 'false' before merging - IGNORE_CACHE_AND_DO_FULL_REBUILD: 'false' + IGNORE_CACHE_AND_DO_FULL_REBUILD: 'true' jobs: build: diff --git a/vinca.yaml b/vinca.yaml index 98b1081f..9254f0c6 100644 --- a/vinca.yaml +++ b/vinca.yaml @@ -5,12 +5,12 @@ conda_index: - robostack.yaml - packages-ignore.yaml -# Reminder for next full rebuild, the next build number should be 23 -build_number: 22 +# Reminder for next full rebuild, the next build number should be 24 +build_number: 23 mutex_package: name: "ros2-distro-mutex" - version: "0.17.0" + version: "0.18.0" upper_bound: "x.x" run_constraints: - libboost 1.90.* From 639efdd6377a1041761800482cc92257f883ab67 Mon Sep 17 00:00:00 2001 From: Daisuke Nishimatsu <42202095+wep21@users.noreply.github.com> Date: Wed, 1 Jul 2026 14:39:50 +0900 Subject: [PATCH 3/4] Apply suggestion from @wep21 --- .github/workflows/testpr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testpr.yml b/.github/workflows/testpr.yml index 9c6bbb15..67557768 100644 --- a/.github/workflows/testpr.yml +++ b/.github/workflows/testpr.yml @@ -7,7 +7,7 @@ env: # Change to 'true' to enable the cache upload as artifacts SAVE_CACHE_AS_ARTIFACT: 'true' # Change to 'true' to ignore cache and force a full rebuild, but please restore to 'false' before merging - IGNORE_CACHE_AND_DO_FULL_REBUILD: 'true' + IGNORE_CACHE_AND_DO_FULL_REBUILD: 'false' jobs: build: From 684ab61522620e594cc8e66a163d0e4a65d7eedd Mon Sep 17 00:00:00 2001 From: wep21 Date: Wed, 1 Jul 2026 16:55:24 +0900 Subject: [PATCH 4/4] fix windows ci Signed-off-by: wep21 --- .github/workflows/testpr.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/testpr.yml b/.github/workflows/testpr.yml index 67557768..78d0bc8f 100644 --- a/.github/workflows/testpr.yml +++ b/.github/workflows/testpr.yml @@ -4,6 +4,7 @@ on: env: ROS_VERSION: 2 + PYTHONIOENCODING: utf-8 # Change to 'true' to enable the cache upload as artifacts SAVE_CACHE_AS_ARTIFACT: 'true' # Change to 'true' to ignore cache and force a full rebuild, but please restore to 'false' before merging