Skip to content

Commit 422dde3

Browse files
authored
Merge pull request #19 from syswonder/dev/code-cleanup
chore: update submodule configurations and enhance issue templates
2 parents 9394bb4 + da0c134 commit 422dde3

File tree

5 files changed

+103
-33
lines changed

5 files changed

+103
-33
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
name: Bug Report
3-
about: Report a bug in the robonix embodied intelligence framework
3+
about: Report a bug in the Robonix
44
title: '[BUG] '
55
labels: 'bug'
66
assignees: ''
@@ -11,14 +11,14 @@ assignees: ''
1111
Brief description of the issue.
1212

1313
## Component
14-
- [ ] Brain (AI/LLM)
15-
- [ ] Capability (Hardware interface)
16-
- [ ] Driver (Hardware driver)
17-
- [ ] Manager (System bootstrap)
18-
- [ ] Memory (Knowledge storage)
19-
- [ ] Simulator (Genesis simulation)
20-
- [ ] Skill (Behavioral logic)
21-
- [ ] UAPI (User programming interface)
14+
15+
- [ ] **Managers** (Task, Maps, AI Model services)
16+
- [ ] **UI System**
17+
- [ ] **RIDL Executor**
18+
- [ ] **Skill Library**
19+
- [ ] **Primitive HAL** (Camera, Base, Arm, …)
20+
- [ ] **Libraries / ROS2** (stack, bindings)
21+
- [ ] Other / not sure
2222

2323
## Steps to Reproduce
2424
1.
@@ -31,8 +31,8 @@ What should happen instead.
3131
## Environment
3232
- OS: [e.g. Ubuntu 22.04]
3333
- ROS2 Version: [e.g. Humble]
34-
- Python Version: [e.g. 3.8]
35-
- Hardware: [e.g. Piper Ranger, Genesis Simulator]
34+
- Rust Version: [e.g. 1.75]
35+
- Hardware: [e.g. robot base, camera, simulator]
3636

3737
## Error Logs
3838
```

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
name: Feature Request
3-
about: Suggest a new feature for the robonix embodied intelligence framework
3+
about: Suggest a new feature for the Robonix
44
title: '[FEATURE] '
55
labels: 'enhancement'
66
assignees: ''
@@ -11,14 +11,14 @@ assignees: ''
1111
Brief description of the proposed feature.
1212

1313
## Component
14-
- [ ] Brain (AI/LLM)
15-
- [ ] Capability (Hardware interface)
16-
- [ ] Driver (Hardware driver)
17-
- [ ] Manager (System bootstrap)
18-
- [ ] Memory (Knowledge storage)
19-
- [ ] Simulator (Genesis simulation)
20-
- [ ] Skill (Behavioral logic)
21-
- [ ] UAPI (User programming interface)
14+
15+
- [ ] **Managers** (Task, Maps, AI Model services)
16+
- [ ] **UI System**
17+
- [ ] **RIDL Executor**
18+
- [ ] **Skill Library**
19+
- [ ] **Primitive HAL** (Camera, Base, Arm, …)
20+
- [ ] **Libraries / ROS2** (stack, bindings)
21+
- [ ] Other / not sure
2222

2323
## Problem Statement
2424
What problem does this feature solve?

.github/workflows/ci.yml

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
# Robonix CI — all build/check logic lives in rust/Makefile (make ci-rust / make ci-full)
2+
name: CI
3+
4+
on:
5+
push:
6+
branches: [main, dev/**]
7+
pull_request:
8+
branches: [main, dev/**]
9+
10+
env:
11+
RUST_DIR: rust
12+
13+
jobs:
14+
rust:
15+
name: Rust (make ci-rust)
16+
runs-on: ubuntu-22.04
17+
steps:
18+
- uses: actions/checkout@v4
19+
20+
- name: Install Rust
21+
uses: dtolnay/rust-toolchain@stable
22+
with:
23+
components: rustfmt
24+
25+
- name: make ci-rust
26+
run: cd ${{ env.RUST_DIR }} && make ci-rust
27+
28+
full:
29+
name: Full (make ci-full)
30+
runs-on: ubuntu-22.04
31+
steps:
32+
- uses: actions/checkout@v4
33+
34+
- name: Install ROS2 Humble
35+
run: |
36+
sudo apt-get update
37+
sudo apt-get install -y locales
38+
sudo locale-gen en_US en_US.UTF-8
39+
sudo update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8
40+
export LANG=en_US.UTF-8
41+
sudo apt-get install -y curl gnupg2 lsb-release
42+
sudo curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg
43+
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2/ubuntu $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/ros2.list > /dev/null
44+
sudo apt-get update
45+
sudo apt-get install -y ros-humble-ros-base python3-pip
46+
47+
- name: Install Rust
48+
uses: dtolnay/rust-toolchain@stable
49+
50+
- name: Install colcon
51+
run: |
52+
source /opt/ros/humble/setup.bash
53+
pip3 install --user colcon-common-extensions
54+
echo "$HOME/.local/bin" >> $GITHUB_PATH
55+
export PATH="$HOME/.local/bin:$PATH"
56+
which colcon
57+
58+
- name: make ci-full
59+
run: |
60+
source /opt/ros/humble/setup.bash
61+
cd ${{ env.RUST_DIR }} && make ci-full
62+
env:
63+
PYTHON3_EXECUTABLE: /usr/bin/python3

.gitmodules

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
1-
[submodule "robonix/driver/realsense_ros2/src/realsense-ros"]
2-
path = robonix/driver/realsense_ros2/src/realsense-ros
3-
url = https://github.com/enkerewpo/realsense-ros.git
4-
[submodule "robonix/driver/mid360/src/livox_ros_driver2"]
5-
path = robonix/driver/mid360/src/livox_ros_driver2
6-
url = https://github.com/enkerewpo/livox_ros_driver2.git
7-
[submodule "robonix/driver/ranger_ros2/src/ranger_ros2"]
8-
path = robonix/driver/ranger_ros2/src/ranger_ros2
9-
url = https://github.com/enkerewpo/ranger_ros2
10-
[submodule "robonix/driver/ranger_ros2/src/ugv_sdk"]
11-
path = robonix/driver/ranger_ros2/src/ugv_sdk
12-
url = https://github.com/enkerewpo/ugv_sdk.git
131
[submodule "ros2-client"]
142
path = rust/lib/ros2-client
153
url = https://github.com/enkerewpo/ros2-client

rust/Makefile

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Tab completion: bash-completion is installed in Docker container
77
# If tab completion doesn't work, ensure bash-completion is installed and enabled
88

9-
.PHONY: help build build-cli build-core build-sdk debug release install install-cli install-core source-sdk env clean test test-all test-rust test-python test-cpp test-ros2 benchmark check setup-dev fmt test-framework
9+
.PHONY: help build build-cli build-core build-sdk debug release install install-cli install-core source-sdk env clean test test-all test-rust test-python test-cpp test-ros2 benchmark check setup-dev fmt fmt-check ci-rust ci-full test-framework
1010
.DEFAULT_GOAL := help
1111

1212
# Default ROS2 distribution (can be overridden)
@@ -49,9 +49,14 @@ help:
4949
@echo "Development commands:"
5050
@echo " make setup-dev - Setup development environment (link provider directory)"
5151
@echo " make fmt - Format code using cargo fmt"
52+
@echo " make fmt-check - Check format only (CI; fails if not formatted)"
5253
@echo " make check - Run cargo check on all Rust projects"
5354
@echo " make clean - Clean build artifacts"
5455
@echo ""
56+
@echo "CI (single entry points):"
57+
@echo " make ci-rust - Format check + cargo check + build (no ROS2)"
58+
@echo " make ci-full - Build SDK + Rust (requires ROS2 sourced, colcon on PATH)"
59+
@echo ""
5560
@echo "Test commands:"
5661
@echo " make test - Run all tests (Rust, Python)"
5762
@echo " make test-rust - Run Rust CLI stress tests"
@@ -111,6 +116,13 @@ build-sdk:
111116
# Alias for backward compatibility
112117
buildsdk: build-sdk
113118

119+
# CI targets (single entry points; extend these when adding packages)
120+
ci-rust: fmt-check check build
121+
@echo "✓ ci-rust done"
122+
123+
ci-full: build-sdk build
124+
@echo "✓ ci-full done (requires: ROS2 sourced, colcon on PATH)"
125+
114126
# Install commands
115127
install: install-cli install-core
116128
@echo "✓ All binaries installed successfully"
@@ -216,6 +228,13 @@ fmt:
216228
cd $(CORE_DIR) && cargo fmt
217229
@echo "✓ Code formatted"
218230

231+
# Check formatting only (for CI; fails if not formatted)
232+
fmt-check:
233+
@echo "Checking code format with cargo fmt -- --check..."
234+
cd $(CLI_DIR) && cargo fmt -- --check
235+
cd $(CORE_DIR) && cargo fmt -- --check
236+
@echo "✓ Format check passed"
237+
219238
# Check and test
220239
check:
221240
@echo "Running cargo check on all Rust projects..."

0 commit comments

Comments
 (0)