Skip to content

build: import rai_interfaces with vcstool #585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions .github/workflows/poetry-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ jobs:
run: |
rosdep update

- name: Import ros2 dependencies
shell: bash
run: |
vcs import . < ros_deps.repos

- name: Install ROS 2 package dependencies
shell: bash
run: |
Expand All @@ -64,6 +69,5 @@ jobs:
- name: Run tests
shell: bash
run: |
source /opt/ros/${{ matrix.ros_distro }}/setup.bash
source install/setup.bash
poetry run pytest -m "not billable"
source setup_shell.sh
pytest -m "not billable"
18 changes: 17 additions & 1 deletion .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,30 @@ on:

jobs:
pre-commit:
runs-on: ubuntu-24.04
runs-on:
- self-hosted

container:
image: osrf/ros:humble-desktop-full
Comment on lines +12 to +16
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why these changes?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so that vcs works.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

installing it in a bare ubuntu image is not easy


steps:
- name: Install pre-commit
run: |
apt update && apt install -y python3-pip shellcheck python-is-python3

- name: Checkout code
uses: actions/checkout@v4
with:
fetch-depth: 0

- run: |
git config --global --add safe.directory /__w/rai/rai

- name: Import ros2 dependencies
shell: bash
run: |
vcs import . < ros_deps.repos

- name: Run pre-commit
uses: pre-commit/[email protected]
with:
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ log/
# Distribution / packaging
.Python
build/
develop-eggs/
dist/
develop-eggs/ dist/
downloads/
eggs/
.eggs/
Expand Down Expand Up @@ -176,6 +175,7 @@ artifact_database.pkl
imgui.ini

src/rai_bench/rai_bench/experiments
src/rai_interfaces

# Demo assets
demo_assets/
2 changes: 2 additions & 0 deletions docs/demos/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,6 @@ All demos require:
- ROS 2 (Humble or Jazzy)
- RAI platform setup

Make sure to follow the [installation instructions](../setup/install.md).

For detailed setup and running instructions, please refer to the individual demo documentation linked above.
10 changes: 8 additions & 2 deletions docs/setup/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,13 @@ git clone https://github.com/RobotecAI/rai.git
cd rai
```

### 1.3 Create poetry virtual environment and install dependencies:
### 1.3 Download [rai_interfaces](https://github.com/RobotecAI/rai_interfaces)

```bash
vcs import < ros_deps.repos
```

### 1.4 Create poetry virtual environment and install dependencies:

```bash
poetry install
Expand All @@ -69,7 +75,7 @@ rosdep install --from-paths src --ignore-src -r -y
| [nomad][nomad] | Visual Navigation - NoMaD integration | visualnav_transformer |
| docs | Documentation-related dependencies | mkdocs, mkdocs-material, pymdown-extensions |

### 1.4 Configure RAI
### 1.5 Configure RAI

Run the configuration tool to set up your LLM vendor and other settings:

Expand Down
5 changes: 5 additions & 0 deletions ros_deps.repos
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
repositories:
src/rai_interfaces:
type: git
url: https://github.com/RobotecAI/rai_interfaces.git
version: main
47 changes: 0 additions & 47 deletions src/rai_interfaces/CMakeLists.txt

This file was deleted.

202 changes: 0 additions & 202 deletions src/rai_interfaces/LICENSE

This file was deleted.

13 changes: 0 additions & 13 deletions src/rai_interfaces/action/Task.action

This file was deleted.

13 changes: 0 additions & 13 deletions src/rai_interfaces/action/TaskFeedback.action

This file was deleted.

Loading
Loading