Skip to content

Commit 801d95e

Browse files
authored
chore: revert bindings-related changes (#5)
Signed-off-by: Esteve Fernandez <[email protected]>
1 parent 9641731 commit 801d95e

File tree

5 files changed

+8
-134
lines changed

5 files changed

+8
-134
lines changed

.github/workflows/generate-bindings.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,20 @@ jobs:
2121
- kilted
2222
- rolling
2323
include:
24-
# Note: We use desktop because the base image does not include rcl_action
2524
# Humble Hawksbill (May 2022 - May 2027)
26-
- docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-humble-desktop-latest
25+
- docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-humble-ros-base-latest
2726
ros_distribution: humble
2827
ros_version: 2
2928
# Jazzy Jalisco (May 2024 - May 2029)
30-
- docker_image: rostooling/setup-ros-docker:ubuntu-noble-ros-jazzy-desktop-latest
29+
- docker_image: rostooling/setup-ros-docker:ubuntu-noble-ros-jazzy-ros-base-latest
3130
ros_distribution: jazzy
3231
ros_version: 2
3332
# Kilted Kaiju (May 2025 - Dec 2026)
34-
- docker_image: rostooling/setup-ros-docker:ubuntu-noble-ros-kilted-desktop-latest
33+
- docker_image: rostooling/setup-ros-docker:ubuntu-noble-ros-kilted-ros-base-latest
3534
ros_distribution: kilted
3635
ros_version: 2
3736
# Rolling Ridley (June 2020 - Present)
38-
- docker_image: rostooling/setup-ros-docker:ubuntu-noble-ros-rolling-desktop-latest
37+
- docker_image: rostooling/setup-ros-docker:ubuntu-noble-ros-rolling-ros-base-latest
3938
ros_distribution: rolling
4039
ros_version: 2
4140
runs-on: ubuntu-latest
@@ -81,7 +80,8 @@ jobs:
8180
- name: Generate bindings
8281
run: |
8382
. /opt/ros/${{ matrix.ros_distribution }}/setup.sh
84-
cargo run --bin rclrs_generate_bindings
83+
cd rclrs/src
84+
../generate_bindings.py rcl_wrapper.h ${{ matrix.ros_distribution }} .
8585
8686
- name: Submit PR
8787
run: |
@@ -101,6 +101,8 @@ jobs:
101101
fi
102102
git add rclrs/src/rcl_bindings_generated_${{ matrix.ros_distribution }}.rs
103103
git commit -m "Regenerate bindings for ${{ matrix.ros_distribution }}"
104+
git fetch origin update-bindings-${{ matrix.ros_distribution }}
105+
git rebase origin/update-bindings-${{ matrix.ros_distribution }}
104106
git push -u origin update-bindings-${{ matrix.ros_distribution }}
105107
if [ $CREATE_PR -eq 1 ]; then
106108
gh pr create --base main --head update-bindings-${{ matrix.ros_distribution }} --title "Regenerate bindings for ${{ matrix.ros_distribution }}" --body "This PR regenerates the bindings for ${{ matrix.ros_distribution }}."

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
[workspace]
22
members = [
33
"rclrs",
4-
"generate_bindings",
54
]
65
resolver = "2"

README.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,3 @@ ros2 launch examples_rclrs_minimal_pub_sub minimal_pub_sub.launch.xml
7474
Further documentation articles:
7575
- [Tutorial on writing your first node with `rclrs`](docs/writing-your-first-rclrs-node.md)
7676
- [Contributor's guide](docs/CONTRIBUTING.md)
77-
78-
> [!TIP]
79-
> For maintainers: To (re-)generate bindings for a certain ROS distro, source that distro
80-
> and then run `cargo run --bin rclrs_generate_bindings` from this root directory of the repo.
81-
> Remember to commit the new or changed binding file.

generate_bindings/Cargo.toml

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

generate_bindings/src/main.rs

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

0 commit comments

Comments
 (0)