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
9 changes: 5 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
# Generate recipes for osx
- name: Reset repo
run: |
git reset --hard origin/main
git reset --hard origin/${{ github.ref_name }}
- name: Generate recipes for osx-64
run: |
git clean -fdx
Expand All @@ -70,7 +70,7 @@ jobs:
# Generate recipes for osx-arm64
- name: Reset repo
run: |
git reset --hard origin/main
git reset --hard origin/${{ github.ref_name }}
- name: Generate recipes for osx-arm64
run: |
git clean -fdx
Expand All @@ -95,7 +95,7 @@ jobs:
# Generate recipes for Windows
- name: Reset repo
run: |
git reset --hard origin/main
git reset --hard origin/${{ github.ref_name }}
- name: Generate recipes for win-64
run: |
git clean -fdx
Expand All @@ -121,7 +121,7 @@ jobs:
# Generate recipes for Linux ARM64
- name: Reset repo
run: |
git reset --hard origin/main
git reset --hard origin/${{ github.ref_name }}
- name: Generate recipes for linux-aarch64
run: |
git clean -fdx
Expand Down Expand Up @@ -149,3 +149,4 @@ on:
branches:
- master
- main
- mutex-0.20
4 changes: 4 additions & 0 deletions pkg_additional_info.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ visp:
override_version: '3.6.0'
zenoh_cpp_vendor:
additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK -DUSE_SYSTEM_ZENOH=ON"
build_number: 26 # rmw_zenoh 0.10.6 backport onto mutex 0.20
# Remove build_number fields below on new full rebuild
diagnostic_updater:
additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"
Expand All @@ -241,3 +242,6 @@ robot_state_publisher:
build_number: 26
tf2_ros:
build_number: 26
# rmw_zenoh 0.10.6 backport onto ros2-distro-mutex 0.20 (fixes a bug in 0.10.5).
rmw_zenoh_cpp:
build_number: 26
12 changes: 6 additions & 6 deletions rosdistro_snapshot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18650,9 +18650,9 @@ rmw_zenoh_cpp:
- tracetools
- zenoh_cpp_vendor
repository: https://github.com/ros2/rmw_zenoh
tag: release/lyrical/rmw_zenoh_cpp/0.10.5-1
tag: release/lyrical/rmw_zenoh_cpp/0.10.6-1
url: https://github.com/ros2-gbp/rmw_zenoh-release.git
version: 0.10.5
version: 0.10.6
roboplan:
dependencies:
- ament_cmake
Expand Down Expand Up @@ -26513,9 +26513,9 @@ zenoh_cpp_vendor:
- ament_cmake
- ament_cmake_vendor_package
repository: https://github.com/ros2/rmw_zenoh
tag: release/lyrical/zenoh_cpp_vendor/0.10.5-1
tag: release/lyrical/zenoh_cpp_vendor/0.10.6-1
url: https://github.com/ros2-gbp/rmw_zenoh-release.git
version: 0.10.5
version: 0.10.6
zenoh_security_tools:
dependencies:
- ament_lint_auto
Expand All @@ -26525,9 +26525,9 @@ zenoh_security_tools:
- rmw_security_common
- zenoh_cpp_vendor
repository: https://github.com/ros2/rmw_zenoh
tag: release/lyrical/zenoh_security_tools/0.10.5-1
tag: release/lyrical/zenoh_security_tools/0.10.6-1
url: https://github.com/ros2-gbp/rmw_zenoh-release.git
version: 0.10.5
version: 0.10.6
zlib_point_cloud_transport:
dependencies:
- ament_cmake
Expand Down
Loading