Skip to content

Commit e4ca229

Browse files
luca-della-vedovaluca-della-vedova
committed
Merge remote-tracking branch 'origin/main' into dynamic_messages
Signed-off-by: Luca Della Vedova <[email protected]>
2 parents ba49f22 + b40f96a commit e4ca229

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+208
-1116
lines changed

‎.github/workflows/release-plz.yml‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
name: Release-plz
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
8+
jobs:
9+
release-plz-release:
10+
name: Release-plz release
11+
runs-on: ubuntu-latest
12+
if: ${{ github.repository_owner == 'ros2-rust' }}
13+
permissions:
14+
contents: write
15+
steps:
16+
# Generating a GitHub token, so that PRs and tags created by
17+
# the release-plz-action can trigger actions workflows.
18+
- name: Generate GitHub token
19+
uses: actions/create-github-app-token@v2
20+
id: generate-token
21+
with:
22+
# GitHub App ID secret name
23+
app-id: ${{ secrets.APP_ID }}
24+
# GitHub App private key secret name
25+
private-key: ${{ secrets.APP_PRIVATE_KEY }}
26+
- name: Checkout repository
27+
uses: actions/checkout@v4
28+
with:
29+
fetch-depth: 0
30+
token: ${{ steps.generate-token.outputs.token }}
31+
- name: Install Rust toolchain
32+
uses: dtolnay/rust-toolchain@stable
33+
- name: Run release-plz
34+
uses: release-plz/[email protected]
35+
with:
36+
command: release
37+
env:
38+
GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }}
39+
CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
40+
41+
release-plz-pr:
42+
name: Release-plz PR
43+
runs-on: ubuntu-latest
44+
if: ${{ github.repository_owner == 'ros2-rust' }}
45+
permissions:
46+
pull-requests: write
47+
contents: write
48+
concurrency:
49+
group: release-plz-${{ github.ref }}
50+
cancel-in-progress: false
51+
steps:
52+
# Generating a GitHub token, so that PRs and tags created by
53+
# the release-plz-action can trigger actions workflows.
54+
- name: Generate GitHub token
55+
uses: actions/create-github-app-token@v2
56+
id: generate-token
57+
with:
58+
# GitHub App ID secret name
59+
app-id: ${{ secrets.APP_ID }}
60+
# GitHub App private key secret name
61+
private-key: ${{ secrets.APP_PRIVATE_KEY }}
62+
- name: Checkout repository
63+
uses: actions/checkout@v4
64+
with:
65+
fetch-depth: 0
66+
token: ${{ steps.generate-token.outputs.token }}
67+
- name: Install Rust toolchain
68+
uses: dtolnay/rust-toolchain@stable
69+
- name: Run release-plz
70+
uses: release-plz/[email protected]
71+
with:
72+
command: release-pr
73+
env:
74+
GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }}
75+
CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}

‎.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

‎Cargo.toml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[workspace]
2+
members = [
3+
"rclrs",
4+
]
5+
resolver = "2"

‎examples/logging_demo/Cargo.toml‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎examples/logging_demo/package.xml‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎examples/logging_demo/src/main.rs‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎examples/message_demo/Cargo.toml‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎examples/message_demo/package.xml‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)