Skip to content

Commit

Permalink
Merge branch 'master' into types
Browse files Browse the repository at this point in the history
  • Loading branch information
lhstrh authored Dec 2, 2023
2 parents 6c9ad47 + 5e137a5 commit f5101ee
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/actions/setup-ros2/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ runs:
# see https://github.com/ros-tooling/setup-ros/issues/80 and https://github.com/ros2/rmw_cyclonedds/pull/134
run: sed -e 's/azure.archive.ubuntu.com/us.archive.ubuntu.com/g' -e t -e d /etc/apt/sources.list | sudo tee /etc/apt/sources.list.d/nonazure.list
- name: Setup ROS2
uses: ros-tooling/setup-ros@0.6.1
uses: ros-tooling/setup-ros@0.7.0
with:
required-ros-distributions: rolling
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,7 @@ private static String generateActionVariablesInReaction(
+ ")"
+ tokenPointer
+ "->value;");
builder.pr(action.getName() + "->length = " + tokenPointer + "->length;");
} else {
builder.pr(
action.getName()
Expand Down

0 comments on commit f5101ee

Please sign in to comment.