Skip to content

Commit 421784b

Browse files
committed
Merge remote-tracking branch 'origin/main' into worker_with_timers
Signed-off-by: Michael X. Grey <[email protected]>
2 parents 2e2dce0 + cf64a41 commit 421784b

File tree

11 files changed

+9
-3534
lines changed

11 files changed

+9
-3534
lines changed

.github/workflows/rust-minimal.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
for path in $(colcon list | awk '$3 == "(ament_cargo)" { print $2 }'); do
100100
cd $path
101101
echo "Running clippy in $path"
102-
# Run clippy for all features except generate_docs (needed for docs.rs)
102+
# Run clippy for all features except use_ros_shim (needed for docs.rs)
103103
if [ "$(basename $path)" = "rclrs" ]; then
104104
cargo clippy --no-deps --all-targets -F default,dyn_msg -- -D warnings
105105
else
@@ -115,7 +115,7 @@ jobs:
115115
for path in $(colcon list | awk '$3 == "(ament_cargo)" && $1 != "examples_rclrs_minimal_pub_sub" && $1 != "examples_rclrs_minimal_client_service" && $1 != "rust_pubsub" { print $2 }'); do
116116
cd $path
117117
echo "Running cargo test in $path"
118-
# Run cargo test for all features except generate_docs (needed for docs.rs)
118+
# Run cargo test for all features except use_ros_shim (needed for docs.rs)
119119
if [ "$(basename $path)" = "rclrs" ]; then
120120
cargo test -F default,dyn_msg
121121
elif [ "$(basename $path)" = "rosidl_runtime_rs" ]; then

.github/workflows/rust-stable.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
for path in $(colcon list | awk '$3 == "(ament_cargo)" { print $2 }'); do
100100
cd $path
101101
echo "Running clippy in $path"
102-
# Run clippy for all features except generate_docs (needed for docs.rs)
102+
# Run clippy for all features except use_ros_shim (needed for docs.rs)
103103
if [ "$(basename $path)" = "rclrs" ]; then
104104
cargo clippy --no-deps --all-targets -F default,dyn_msg -- -D warnings
105105
else
@@ -115,7 +115,7 @@ jobs:
115115
for path in $(colcon list | awk '$3 == "(ament_cargo)" && $1 != "examples_rclrs_minimal_pub_sub" && $1 != "examples_rclrs_minimal_client_service" && $1 != "rust_pubsub" { print $2 }'); do
116116
cd $path
117117
echo "Running cargo test in $path"
118-
# Run cargo test for all features except generate_docs (needed for docs.rs)
118+
# Run cargo test for all features except use_ros_shim (needed for docs.rs)
119119
if [ "$(basename $path)" = "rclrs" ]; then
120120
cargo test -F default,dyn_msg
121121
elif [ "$(basename $path)" = "rosidl_runtime_rs" ]; then

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ dmypy.json
214214
# Generated by Cargo
215215
# will have compiled files and executables
216216
/target/
217+
Cargo.lock
217218

218219
# These are backup files generated by rustfmt
219220
**/*.rs.bk

0 commit comments

Comments
 (0)