Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/testpr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
18 changes: 18 additions & 0 deletions patch/ros-lyrical-ament-cmake-core.patch
Original file line number Diff line number Diff line change
@@ -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((
22 changes: 22 additions & 0 deletions patch/ros-lyrical-ament-package.patch
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions vinca.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ conda_index:
- robostack.yaml
- packages-ignore.yaml

# Reminder for next full rebuild, the next build number should be 22
build_number: 21
# Reminder for next full rebuild, the next build number should be 23
build_number: 22

mutex_package:
name: "ros2-distro-mutex"
version: "0.17.0"
version: "0.18.0"
upper_bound: "x.x"
run_constraints:
- libboost 1.90.*
Expand Down
Loading