From 14159eea77491a15e371c422fc46c70d63c1eb6b Mon Sep 17 00:00:00 2001 From: Arjo Chakravarty Date: Mon, 22 Jun 2026 07:43:33 +0000 Subject: [PATCH 01/31] chore: Add CI configuration from arjoc/feat/ci_config Copying .github/workflows and docker files to enable CI on epic/next-gen-base. Signed-off-by: Arjo Chakravarty --- .github/workflows/build_base.yml | 54 +++++++++++++++++++++++++++++ .github/workflows/ci.yml | 37 ++++++++++++++++++++ docker/Dockerfile.base | 59 ++++++++++++++++++++++++++++++++ docker/base.repos | 53 ++++++++++++++++++++++++++++ 4 files changed, 203 insertions(+) create mode 100644 .github/workflows/build_base.yml create mode 100644 .github/workflows/ci.yml create mode 100644 docker/Dockerfile.base create mode 100644 docker/base.repos diff --git a/.github/workflows/build_base.yml b/.github/workflows/build_base.yml new file mode 100644 index 0000000..d8bd674 --- /dev/null +++ b/.github/workflows/build_base.yml @@ -0,0 +1,54 @@ +name: Build and Publish Base Container + +on: + push: + branches: [ arjoc/feat/ci_config ] + paths: + - 'docker/Dockerfile.base' + - 'docker/base.repos' + workflow_dispatch: + +env: + REGISTRY: ghcr.io + IMAGE_NAME: ${{ github.repository_owner }}/ros2_rust_base + +jobs: + build-and-push: + name: Build and Push ROS 2 Rust Base Image + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Log in to the Container registry + uses: docker/login-action@v3 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + tags: | + type=raw,value=jazzy + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Build and push Docker image + uses: docker/build-push-action@v5 + with: + context: . + file: ./docker/Dockerfile.base + push: ${{ github.event_name != 'pull_request' }} + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + cache-from: type=gha + cache-to: type=gha,mode=max diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..41f67fa --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,37 @@ +name: Next-Gen Prototype CI + +on: + push: + branches: [ arjoc/feat/ci_config ] + pull_request: + branches: [ arjoc/feat/ci_config ] + +jobs: + ci-check: + name: Colcon Overlay Build & Test Suite + runs-on: ubuntu-latest + container: + image: ghcr.io/arjo129/ros2_rust_base:jazzy + + steps: + - name: Checkout Prototype Repository + uses: actions/checkout@v4 + with: + path: next_gen_ws/src/next_gen_prototype + + - name: Build Prototype Packages (Overlay Workspace) + working-directory: next_gen_ws + run: | + source /opt/ros/jazzy/setup.bash + source /opt/ros2_rust_ws/install/setup.bash + colcon build + shell: bash + + - name: Run Automated Verification Tests + working-directory: next_gen_ws + run: | + source /opt/ros2_rust_ws/install/setup.bash + source install/setup.bash + colcon test --packages-select rmf_path_server_test --event-handlers console_direct+ + colcon test-result --all + shell: bash diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base new file mode 100644 index 0000000..78c4f1f --- /dev/null +++ b/docker/Dockerfile.base @@ -0,0 +1,59 @@ +FROM ros:jazzy-ros-base + +# Disable interactive prompts during package installation +ENV DEBIAN_FRONTEND=noninteractive + +# Install core build dependencies, Rust prerequisites, and ROS 2 build tools +RUN apt-get update && apt-get install -y --no-install-recommends \ + curl \ + git \ + python3-pip \ + python3-vcstool \ + clang \ + libclang-dev \ + build-essential \ + python3-colcon-common-extensions \ + libssl-dev \ + pkg-config \ + && rm -rf /var/lib/apt/lists/* + +# Install Rust toolchain (Stable) and global Cargo tools accessible to all users +ENV RUSTUP_HOME=/usr/local/rustup \ + CARGO_HOME=/usr/local/cargo \ + PATH=/usr/local/cargo/bin:$PATH +RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path && \ + cargo install cargo-ament-build && \ + chmod -R a+rwX /usr/local/cargo /usr/local/rustup + +# Install Cargo / Colcon ROS 2 Rust integration tools via pip +RUN pip3 install -U --break-system-packages colcon-cargo colcon-ros-cargo + +# Initialize Underlay Workspace +WORKDIR /opt/ros2_rust_ws + +# Copy minimal ROS 2 Rust dependency definitions (from repo root context) +COPY docker/base.repos ./base.repos + +# Import base repositories (now including main ros2_rust repo with rclrs) +RUN mkdir -p src && vcs import src < base.repos + +# Stage the prototype branch to resolve its rosdep system dependencies directly into the base image +COPY . /tmp/next_gen_prototype + +# Install ROS 2 dependencies via rosdep for both underlay and prototype branch +RUN apt-get update && \ + rosdep init || true && \ + rosdep update && \ + rosdep install --from-paths src /tmp/next_gen_prototype --ignore-src -y --skip-keys="rclrs ament_cargo ament_python" && \ + rm -rf /var/lib/apt/lists/* && \ + rm -rf /tmp/next_gen_prototype + +# Build the Underlay Workspace +RUN /bin/bash -c "source /opt/ros/jazzy/setup.bash && \ + colcon build --cmake-args -DCMAKE_BUILD_TYPE=Release" + +# Provide automatic sourcing entrypoint configuration inside ~/.bashrc +RUN echo "source /opt/ros/jazzy/setup.bash" >> /root/.bashrc && \ + echo "source /opt/ros2_rust_ws/install/setup.bash" >> /root/.bashrc + +CMD ["/bin/bash"] diff --git a/docker/base.repos b/docker/base.repos new file mode 100644 index 0000000..ef941e9 --- /dev/null +++ b/docker/base.repos @@ -0,0 +1,53 @@ +repositories: + ros2_rust/src/ros2-rust/ros2_rust: + type: git + url: https://github.com/ros2-rust/ros2_rust.git + version: main + ros2_rust/src/ros2-rust/examples: + type: git + url: https://github.com/ros2-rust/examples.git + version: main + ros2_rust/src/ros2-rust/rosidl_runtime_rs: + type: git + url: https://github.com/ros2-rust/rosidl_runtime_rs.git + version: main + ros2_rust/src/ros2-rust/rosidl_rust: + type: git + url: https://github.com/ros2-rust/rosidl_rust.git + version: main + ros2_rust/src/ros2/common_interfaces: + type: git + url: https://github.com/ros2/common_interfaces.git + version: jazzy + ros2_rust/src/ros2/example_interfaces: + type: git + url: https://github.com/ros2/example_interfaces.git + version: jazzy + ros2_rust/src/ros2/geographic_info: + type: git + url: https://github.com/ros-geographic-info/geographic_info.git + version: ros2 + ros2_rust/src/ros2/rcl_interfaces: + type: git + url: https://github.com/ros2/rcl_interfaces.git + version: jazzy + ros2_rust/src/ros2/rosidl_core: + type: git + url: https://github.com/ros2/rosidl_core.git + version: jazzy + ros2_rust/src/ros2/rosidl_defaults: + type: git + url: https://github.com/ros2/rosidl_defaults.git + version: jazzy + ros2_rust/src/ros2/test_interface_files: + type: git + url: https://github.com/ros2/test_interface_files.git + version: jazzy + ros2_rust/src/ros2/unique_identifier_msgs: + type: git + url: https://github.com/ros2/unique_identifier_msgs.git + version: jazzy + nav2/navigation2: + type: git + url: https://github.com/ros-navigation/navigation2.git + version: jazzy \ No newline at end of file From 5331c10a1cd1b75c1b12ed978ef314f353da968a Mon Sep 17 00:00:00 2001 From: Arjo Chakravarty Date: Mon, 22 Jun 2026 15:54:31 +0800 Subject: [PATCH 02/31] Update branches for build workflow trigger Signed-off-by: Arjo Chakravarty --- .github/workflows/build_base.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_base.yml b/.github/workflows/build_base.yml index d8bd674..2a7f12c 100644 --- a/.github/workflows/build_base.yml +++ b/.github/workflows/build_base.yml @@ -2,7 +2,7 @@ name: Build and Publish Base Container on: push: - branches: [ arjoc/feat/ci_config ] + branches: [ arjoc/feat/ci_config_next_gen, epic/next-gen-base ] paths: - 'docker/Dockerfile.base' - 'docker/base.repos' From fbce150ef4e34d522089f9a1e3a12031413bcc97 Mon Sep 17 00:00:00 2001 From: Arjo Chakravarty Date: Mon, 22 Jun 2026 15:55:23 +0800 Subject: [PATCH 03/31] Update CI workflow branch to epic/next-gen-base Signed-off-by: Arjo Chakravarty --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 41f67fa..dc3d0e1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,9 +2,9 @@ name: Next-Gen Prototype CI on: push: - branches: [ arjoc/feat/ci_config ] + branches: [ epic/next-gen-base ] pull_request: - branches: [ arjoc/feat/ci_config ] + branches: [ epic/next-gen-base ] jobs: ci-check: From 9ed725a20c178dd9dd3bb0d6189785b89cc0c464 Mon Sep 17 00:00:00 2001 From: Arjo Chakravarty Date: Mon, 22 Jun 2026 16:05:11 +0800 Subject: [PATCH 04/31] Add branch to CI workflow for additional feature Signed-off-by: Arjo Chakravarty --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc3d0e1..53574ee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,9 +2,9 @@ name: Next-Gen Prototype CI on: push: - branches: [ epic/next-gen-base ] + branches: [ epic/next-gen-base, arjoc/feat/ci_config_next_gen ] pull_request: - branches: [ epic/next-gen-base ] + branches: [ epic/next-gen-base, arjoc/feat/ci_config_next_gen ] jobs: ci-check: From cca76c892da4e1b44c16e919419e660841375832 Mon Sep 17 00:00:00 2001 From: Arjo Chakravarty Date: Tue, 23 Jun 2026 02:24:12 +0000 Subject: [PATCH 05/31] Remove nav2 stuff Signed-off-by: Arjo Chakravarty --- docker/base.repos | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/docker/base.repos b/docker/base.repos index ef941e9..a8899b9 100644 --- a/docker/base.repos +++ b/docker/base.repos @@ -47,7 +47,4 @@ repositories: type: git url: https://github.com/ros2/unique_identifier_msgs.git version: jazzy - nav2/navigation2: - type: git - url: https://github.com/ros-navigation/navigation2.git - version: jazzy \ No newline at end of file + From 94b070d93d345f74682b4c714e59805300edf04b Mon Sep 17 00:00:00 2001 From: Arjo Chakravarty Date: Tue, 23 Jun 2026 02:29:54 +0000 Subject: [PATCH 06/31] Rosdep new code as well Signed-off-by: Arjo Chakravarty --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 53574ee..708d0df 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,6 +31,7 @@ jobs: working-directory: next_gen_ws run: | source /opt/ros2_rust_ws/install/setup.bash + rosdep install --from-paths src /tmp/next_gen_prototype --ignore-src -y --skip-keys="rclrs ament_cargo ament_python" & source install/setup.bash colcon test --packages-select rmf_path_server_test --event-handlers console_direct+ colcon test-result --all From 7bbb9f0ddd8d11791d5c958e1c254daf374f0277 Mon Sep 17 00:00:00 2001 From: Arjo Chakravarty Date: Tue, 23 Jun 2026 02:30:36 +0000 Subject: [PATCH 07/31] Rosdep new code as well Signed-off-by: Arjo Chakravarty --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 708d0df..f0be283 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: working-directory: next_gen_ws run: | source /opt/ros2_rust_ws/install/setup.bash - rosdep install --from-paths src /tmp/next_gen_prototype --ignore-src -y --skip-keys="rclrs ament_cargo ament_python" & + rosdep install --from-paths . --ignore-src -y --skip-keys="rclrs ament_cargo ament_python" & source install/setup.bash colcon test --packages-select rmf_path_server_test --event-handlers console_direct+ colcon test-result --all From f8ee72db23c0188fadfed68d886840f73b19e56a Mon Sep 17 00:00:00 2001 From: Arjo Chakravarty Date: Tue, 23 Jun 2026 05:55:18 +0000 Subject: [PATCH 08/31] Update CI Signed-off-by: Arjo Chakravarty --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f0be283..9ca7cbe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: name: Colcon Overlay Build & Test Suite runs-on: ubuntu-latest container: - image: ghcr.io/arjo129/ros2_rust_base:jazzy + image: ghcr.io/open-rmf/ros2_rust_base:jazzy steps: - name: Checkout Prototype Repository From c22c3e09f236d88fc42d928b9c7e4b327a0ddee6 Mon Sep 17 00:00:00 2001 From: Arjo Chakravarty Date: Tue, 23 Jun 2026 07:17:15 +0000 Subject: [PATCH 09/31] Update readme Signed-off-by: Arjo Chakravarty --- README.md | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 4b06659..920307e 100644 --- a/README.md +++ b/README.md @@ -20,18 +20,30 @@ on discourse. ## Build Instructions -1. Install `rust`, `colcon-cargo` and `colcon-cargo-ros`: -``` -# Install Rust (see https://rustup.rs/) -curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -# Install required system packages -sudo apt install -y git libclang-dev python3-pip python3-vcstool +1. Install `rust`, `colcon-cargo` and `colcon-cargo-ros`. -# Install colcon plugins for Rust -pip install --break-system-packages colcon-cargo colcon-ros-cargo + **Method 1: Using a machine with ros2-jazzy installed** + + ``` + # Install Rust (see https://rustup.rs/) + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -``` + # Install required system packages + sudo apt install -y git libclang-dev python3-pip python3-vcstool + + # Install colcon plugins for Rust + pip install --break-system-packages colcon-cargo colcon-ros-cargo + + ``` + + **Method 2: Using a container** + We pre-build base containers with all the dependencies you can use `rocker`, `distrobox`, `podman` or + to get a base dev environment. For the purposes of this set of instructions we use distrobox: + ``` + distrobox create --image ghcr.io/open-rmf/ros2_rust_base:jazzy -n ros2_rust_base + distrobox enter ros2_rust_base + ``` 2. **Import Workspace Dependencies (via `.repos` file)** Create a workspace and import the required ROS 2 Rust and navigation dependencies using this [`setup.repos`](https://gist.github.com/arjo129/1711acb6fdf2956640f022a1ebde3869): From 9d1d062afd1274f740cb8bf8346d99637e161172 Mon Sep 17 00:00:00 2001 From: Arjo Chakravarty Date: Tue, 23 Jun 2026 08:00:35 +0000 Subject: [PATCH 10/31] try not using repos file Signed-off-by: Arjo Chakravarty --- docker/Dockerfile.base | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base index 78c4f1f..2897d93 100644 --- a/docker/Dockerfile.base +++ b/docker/Dockerfile.base @@ -35,7 +35,7 @@ WORKDIR /opt/ros2_rust_ws COPY docker/base.repos ./base.repos # Import base repositories (now including main ros2_rust repo with rclrs) -RUN mkdir -p src && vcs import src < base.repos +# RUN mkdir -p src && vcs import src < base.repos # Stage the prototype branch to resolve its rosdep system dependencies directly into the base image COPY . /tmp/next_gen_prototype @@ -49,11 +49,11 @@ RUN apt-get update && \ rm -rf /tmp/next_gen_prototype # Build the Underlay Workspace -RUN /bin/bash -c "source /opt/ros/jazzy/setup.bash && \ - colcon build --cmake-args -DCMAKE_BUILD_TYPE=Release" +#RUN /bin/bash -c "source /opt/ros/jazzy/setup.bash && \ +# colcon build --cmake-args -DCMAKE_BUILD_TYPE=Release" # Provide automatic sourcing entrypoint configuration inside ~/.bashrc -RUN echo "source /opt/ros/jazzy/setup.bash" >> /root/.bashrc && \ - echo "source /opt/ros2_rust_ws/install/setup.bash" >> /root/.bashrc +RUN echo "source /opt/ros/jazzy/setup.bash" >> /root/.bashrc +#echo "source /opt/ros2_rust_ws/install/setup.bash" >> /root/.bashrc CMD ["/bin/bash"] From ece83241f795b0f2e8a6bd258885781369da77f7 Mon Sep 17 00:00:00 2001 From: Arjo Chakravarty Date: Tue, 23 Jun 2026 08:06:44 +0000 Subject: [PATCH 11/31] Fix typo Signed-off-by: Arjo Chakravarty --- docker/Dockerfile.base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base index 2897d93..e700fc8 100644 --- a/docker/Dockerfile.base +++ b/docker/Dockerfile.base @@ -44,7 +44,7 @@ COPY . /tmp/next_gen_prototype RUN apt-get update && \ rosdep init || true && \ rosdep update && \ - rosdep install --from-paths src /tmp/next_gen_prototype --ignore-src -y --skip-keys="rclrs ament_cargo ament_python" && \ + rosdep install --from-paths /tmp/next_gen_prototype --ignore-src -y --skip-keys="rclrs ament_cargo ament_python" && \ rm -rf /var/lib/apt/lists/* && \ rm -rf /tmp/next_gen_prototype From 7e2372bbdf0dd76104b846692d8cf2a21df73514 Mon Sep 17 00:00:00 2001 From: Arjo Chakravarty Date: Tue, 23 Jun 2026 16:09:54 +0800 Subject: [PATCH 12/31] Update README.md Co-authored-by: Xiyu Signed-off-by: Arjo Chakravarty --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 920307e..f097ae1 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,6 @@ on discourse. # Install colcon plugins for Rust pip install --break-system-packages colcon-cargo colcon-ros-cargo - ``` **Method 2: Using a container** From 861fd19a0d4018aa0983d0c7b1def8966559cf6f Mon Sep 17 00:00:00 2001 From: Arjo Chakravarty Date: Tue, 23 Jun 2026 08:13:07 +0000 Subject: [PATCH 13/31] remove broken source path Signed-off-by: Arjo Chakravarty --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9ca7cbe..4f91cee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,6 @@ jobs: working-directory: next_gen_ws run: | source /opt/ros/jazzy/setup.bash - source /opt/ros2_rust_ws/install/setup.bash colcon build shell: bash From f62db4dfa78db421fb185e431475baba7d9bf4ba Mon Sep 17 00:00:00 2001 From: Arjo Chakravarty Date: Tue, 23 Jun 2026 08:32:18 +0000 Subject: [PATCH 14/31] remove broken source path Signed-off-by: Arjo Chakravarty --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4f91cee..00adea5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,14 +23,14 @@ jobs: working-directory: next_gen_ws run: | source /opt/ros/jazzy/setup.bash + rosdep install --from-paths . --ignore-src -y --skip-keys="rclrs ament_cargo ament_python" colcon build shell: bash - name: Run Automated Verification Tests working-directory: next_gen_ws run: | - source /opt/ros2_rust_ws/install/setup.bash - rosdep install --from-paths . --ignore-src -y --skip-keys="rclrs ament_cargo ament_python" & + source /opt/ros/jazzy/setup.bash source install/setup.bash colcon test --packages-select rmf_path_server_test --event-handlers console_direct+ colcon test-result --all From af74575af3eae7e5b1358b8b7c6267af5083103e Mon Sep 17 00:00:00 2001 From: Arjo Chakravarty Date: Tue, 23 Jun 2026 08:40:12 +0000 Subject: [PATCH 15/31] add rosdep init Signed-off-by: Arjo Chakravarty --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 00adea5..b53c28a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,6 +23,8 @@ jobs: working-directory: next_gen_ws run: | source /opt/ros/jazzy/setup.bash + sudo rosdep init || true + rodep update rosdep install --from-paths . --ignore-src -y --skip-keys="rclrs ament_cargo ament_python" colcon build shell: bash From b74c3224703c07f76983de6142352cc74a35bc49 Mon Sep 17 00:00:00 2001 From: Arjo Chakravarty Date: Tue, 23 Jun 2026 08:42:49 +0000 Subject: [PATCH 16/31] to rosdepinit or not that is the question Signed-off-by: Arjo Chakravarty --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b53c28a..868cf5c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,6 @@ jobs: working-directory: next_gen_ws run: | source /opt/ros/jazzy/setup.bash - sudo rosdep init || true rodep update rosdep install --from-paths . --ignore-src -y --skip-keys="rclrs ament_cargo ament_python" colcon build From 1e5cda5e8cf6b5bd968cb0a998ec6d2e435ba6a2 Mon Sep 17 00:00:00 2001 From: Arjo Chakravarty Date: Tue, 23 Jun 2026 08:45:09 +0000 Subject: [PATCH 17/31] rosdep binary Signed-off-by: Arjo Chakravarty --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 868cf5c..15d78e6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: working-directory: next_gen_ws run: | source /opt/ros/jazzy/setup.bash - rodep update + rosdep update rosdep install --from-paths . --ignore-src -y --skip-keys="rclrs ament_cargo ament_python" colcon build shell: bash From ef81869c0ec338dfcd65724008e280ca0b4937c0 Mon Sep 17 00:00:00 2001 From: Arjo Chakravarty Date: Tue, 23 Jun 2026 08:50:05 +0000 Subject: [PATCH 18/31] fix instructions Signed-off-by: Arjo Chakravarty --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f097ae1..21c3c8b 100644 --- a/README.md +++ b/README.md @@ -38,18 +38,19 @@ on discourse. **Method 2: Using a container** We pre-build base containers with all the dependencies you can use `rocker`, `distrobox`, `podman` or - to get a base dev environment. For the purposes of this set of instructions we use distrobox: + anyother oci compliant tool to get a base dev environment. For the purposes of this set of instructions we use distrobox: ``` distrobox create --image ghcr.io/open-rmf/ros2_rust_base:jazzy -n ros2_rust_base distrobox enter ros2_rust_base ``` 2. **Import Workspace Dependencies (via `.repos` file)** - Create a workspace and import the required ROS 2 Rust and navigation dependencies using this [`setup.repos`](https://gist.github.com/arjo129/1711acb6fdf2956640f022a1ebde3869): + Create a workspace and clone the repo: ```bash mkdir -p rmf_ws/src - cd rmf_ws - vcs import src --input https://gist.githubusercontent.com/arjo129/1711acb6fdf2956640f022a1ebde3869/raw/5786aa3d5e87a556c5c6769cc0983264b06a20d7/gistfile1.txt + cd rmf_ws/src + git clone git@github.com:open-rmf/next_gen_prototype.git + cd .. ``` 3. **Build the PR Packages** From fab5a5f6f99c13c1e2bcf75ea46e4e9b04a3e7bc Mon Sep 17 00:00:00 2001 From: Arjo Chakravarty Date: Tue, 23 Jun 2026 08:50:50 +0000 Subject: [PATCH 19/31] Remove repos file Signed-off-by: Arjo Chakravarty --- docker/base.repos | 50 ----------------------------------------------- 1 file changed, 50 deletions(-) delete mode 100644 docker/base.repos diff --git a/docker/base.repos b/docker/base.repos deleted file mode 100644 index a8899b9..0000000 --- a/docker/base.repos +++ /dev/null @@ -1,50 +0,0 @@ -repositories: - ros2_rust/src/ros2-rust/ros2_rust: - type: git - url: https://github.com/ros2-rust/ros2_rust.git - version: main - ros2_rust/src/ros2-rust/examples: - type: git - url: https://github.com/ros2-rust/examples.git - version: main - ros2_rust/src/ros2-rust/rosidl_runtime_rs: - type: git - url: https://github.com/ros2-rust/rosidl_runtime_rs.git - version: main - ros2_rust/src/ros2-rust/rosidl_rust: - type: git - url: https://github.com/ros2-rust/rosidl_rust.git - version: main - ros2_rust/src/ros2/common_interfaces: - type: git - url: https://github.com/ros2/common_interfaces.git - version: jazzy - ros2_rust/src/ros2/example_interfaces: - type: git - url: https://github.com/ros2/example_interfaces.git - version: jazzy - ros2_rust/src/ros2/geographic_info: - type: git - url: https://github.com/ros-geographic-info/geographic_info.git - version: ros2 - ros2_rust/src/ros2/rcl_interfaces: - type: git - url: https://github.com/ros2/rcl_interfaces.git - version: jazzy - ros2_rust/src/ros2/rosidl_core: - type: git - url: https://github.com/ros2/rosidl_core.git - version: jazzy - ros2_rust/src/ros2/rosidl_defaults: - type: git - url: https://github.com/ros2/rosidl_defaults.git - version: jazzy - ros2_rust/src/ros2/test_interface_files: - type: git - url: https://github.com/ros2/test_interface_files.git - version: jazzy - ros2_rust/src/ros2/unique_identifier_msgs: - type: git - url: https://github.com/ros2/unique_identifier_msgs.git - version: jazzy - From 571864e000d4556681f769beeeb2a1c033d028dc Mon Sep 17 00:00:00 2001 From: Arjo Chakravarty Date: Tue, 23 Jun 2026 08:52:55 +0000 Subject: [PATCH 20/31] Remove repos reference Signed-off-by: Arjo Chakravarty --- README.md | 2 +- docker/Dockerfile.base | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/README.md b/README.md index 21c3c8b..563f379 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ on discourse. ```bash mkdir -p rmf_ws/src cd rmf_ws/src - git clone git@github.com:open-rmf/next_gen_prototype.git + git clone https://github.com/open-rmf/next_gen_prototype.git cd .. ``` diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base index e700fc8..c919e6b 100644 --- a/docker/Dockerfile.base +++ b/docker/Dockerfile.base @@ -31,12 +31,6 @@ RUN pip3 install -U --break-system-packages colcon-cargo colcon-ros-cargo # Initialize Underlay Workspace WORKDIR /opt/ros2_rust_ws -# Copy minimal ROS 2 Rust dependency definitions (from repo root context) -COPY docker/base.repos ./base.repos - -# Import base repositories (now including main ros2_rust repo with rclrs) -# RUN mkdir -p src && vcs import src < base.repos - # Stage the prototype branch to resolve its rosdep system dependencies directly into the base image COPY . /tmp/next_gen_prototype From ec9d260edaae7662def2a73839e6eaabcd2f7fcf Mon Sep 17 00:00:00 2001 From: Arjo Chakravarty Date: Wed, 24 Jun 2026 01:22:53 +0000 Subject: [PATCH 21/31] Update dockerfile to use colcon cargo from apt Signed-off-by: Arjo Chakravarty --- docker/Dockerfile.base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base index c919e6b..97fe0d8 100644 --- a/docker/Dockerfile.base +++ b/docker/Dockerfile.base @@ -26,7 +26,7 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no chmod -R a+rwX /usr/local/cargo /usr/local/rustup # Install Cargo / Colcon ROS 2 Rust integration tools via pip -RUN pip3 install -U --break-system-packages colcon-cargo colcon-ros-cargo +RUN apt install python3-colcon-cargo # Initialize Underlay Workspace WORKDIR /opt/ros2_rust_ws From 342690674306fcfb522910ad938fc37f9a8b4ebc Mon Sep 17 00:00:00 2001 From: Arjo Chakravarty Date: Wed, 24 Jun 2026 01:29:48 +0000 Subject: [PATCH 22/31] Update readme instructions Signed-off-by: Arjo Chakravarty --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 563f379..48d92c6 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ on discourse. ## Build Instructions -1. Install `rust`, `colcon-cargo` and `colcon-cargo-ros`. +1. Install `rust` and `colcon-cargo`. **Method 1: Using a machine with ros2-jazzy installed** @@ -33,12 +33,12 @@ on discourse. sudo apt install -y git libclang-dev python3-pip python3-vcstool # Install colcon plugins for Rust - pip install --break-system-packages colcon-cargo colcon-ros-cargo + sudo apt install python3-colcon-cargo ``` **Method 2: Using a container** We pre-build base containers with all the dependencies you can use `rocker`, `distrobox`, `podman` or - anyother oci compliant tool to get a base dev environment. For the purposes of this set of instructions we use distrobox: + any other oci compliant tool to get a base dev environment. For the purposes of this set of instructions we use distrobox: ``` distrobox create --image ghcr.io/open-rmf/ros2_rust_base:jazzy -n ros2_rust_base distrobox enter ros2_rust_base From f975482f66c05edf53bd1e570bf1a45b69a3772e Mon Sep 17 00:00:00 2001 From: Arjo Chakravarty Date: Wed, 24 Jun 2026 01:52:43 +0000 Subject: [PATCH 23/31] Fix apt command Signed-off-by: Arjo Chakravarty --- docker/Dockerfile.base | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base index 97fe0d8..01f3181 100644 --- a/docker/Dockerfile.base +++ b/docker/Dockerfile.base @@ -13,6 +13,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libclang-dev \ build-essential \ python3-colcon-common-extensions \ + python3-colcon-cargo\ libssl-dev \ pkg-config \ && rm -rf /var/lib/apt/lists/* @@ -25,8 +26,6 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no cargo install cargo-ament-build && \ chmod -R a+rwX /usr/local/cargo /usr/local/rustup -# Install Cargo / Colcon ROS 2 Rust integration tools via pip -RUN apt install python3-colcon-cargo # Initialize Underlay Workspace WORKDIR /opt/ros2_rust_ws From 1b4333b912041344b10ead67ca18814908ad7a93 Mon Sep 17 00:00:00 2001 From: Arjo Chakravarty Date: Wed, 24 Jun 2026 11:50:19 +0800 Subject: [PATCH 24/31] Update README for clarity on workspace dependencies Signed-off-by: Arjo Chakravarty --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 48d92c6..5f309b1 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ on discourse. distrobox enter ros2_rust_base ``` -2. **Import Workspace Dependencies (via `.repos` file)** +2. **Import Workspace Dependencies** Create a workspace and clone the repo: ```bash mkdir -p rmf_ws/src From c64a1c6b55709f2fe160462dc839b914903f9276 Mon Sep 17 00:00:00 2001 From: Arjo Chakravarty Date: Wed, 24 Jun 2026 06:41:13 +0000 Subject: [PATCH 25/31] Use rosenv Signed-off-by: Arjo Chakravarty --- path_server/rmf_path_server/Cargo.toml | 9 ++------- path_server/rmf_path_server/src/lib.rs | 6 ++++-- path_server/rmf_path_server/src/planner.rs | 4 ++-- path_server/rmf_plan_executor/Cargo.toml | 8 ++------ path_server/rmf_plan_executor/src/lib.rs | 13 ++++++++----- path_server/rmf_plan_executor/src/main.rs | 4 ++-- rmf_participant_discovery/Cargo.toml | 2 +- rmf_participant_discovery/src/lib.rs | 4 ++-- 8 files changed, 23 insertions(+), 27 deletions(-) diff --git a/path_server/rmf_path_server/Cargo.toml b/path_server/rmf_path_server/Cargo.toml index ddf0df8..da7f739 100644 --- a/path_server/rmf_path_server/Cargo.toml +++ b/path_server/rmf_path_server/Cargo.toml @@ -6,14 +6,9 @@ edition = "2021" [dependencies] futures = "0.3.32" rclrs = "*" -rmf_prototype_msgs = "*" +ros-env = "0.2.0" rmf_participant_discovery = { path = "../../rmf_participant_discovery" } -unique_identifier_msgs = "*" -nav_msgs = "*" -nav2_msgs = "*" -geometry_msgs = "*" -std_msgs = "*" -builtin_interfaces = { version = "2.0.3" } + serde = { version = "1.0", features = ["derive"] } tokio = { version = "1.0", features = ["full"] } mapf = { git = "https://github.com/open-rmf/mapf" } diff --git a/path_server/rmf_path_server/src/lib.rs b/path_server/rmf_path_server/src/lib.rs index e8c09e7..81fdf15 100644 --- a/path_server/rmf_path_server/src/lib.rs +++ b/path_server/rmf_path_server/src/lib.rs @@ -13,9 +13,11 @@ // limitations under the License. use mapf_post::{na::Isometry2, MapfResult, SemanticPlan, SemanticWaypoint}; -use nav_msgs::msg::Odometry; use rclrs::{IntoPrimitiveOptions, Node}; -use rmf_prototype_msgs::msg::{Destination, Plan, PlanId, TrafficDependency, Waypoint}; +use ros_env::builtin_interfaces; +use ros_env::nav_msgs::msg::Odometry; +use ros_env::rmf_prototype_msgs; +use ros_env::rmf_prototype_msgs::msg::{Destination, Plan, PlanId, TrafficDependency, Waypoint}; use std::collections::{hash_map::Entry, HashMap}; use std::sync::Arc; diff --git a/path_server/rmf_path_server/src/planner.rs b/path_server/rmf_path_server/src/planner.rs index c744292..23ab433 100644 --- a/path_server/rmf_path_server/src/planner.rs +++ b/path_server/rmf_path_server/src/planner.rs @@ -14,8 +14,8 @@ use hetpibt::external_tracks_pibt::PiBTWithExternalTracks; use mapf_post::na::Isometry2; -use nav_msgs::msg::Odometry; -use rmf_prototype_msgs::msg::Destination; +use ros_env::nav_msgs::msg::Odometry; +use ros_env::rmf_prototype_msgs::msg::Destination; use std::collections::HashMap; use std::sync::atomic::AtomicBool; diff --git a/path_server/rmf_plan_executor/Cargo.toml b/path_server/rmf_plan_executor/Cargo.toml index a978d74..828959d 100644 --- a/path_server/rmf_plan_executor/Cargo.toml +++ b/path_server/rmf_plan_executor/Cargo.toml @@ -6,11 +6,7 @@ edition = "2021" [dependencies] rclrs = "*" -rmf_prototype_msgs = "*" -nav_msgs = "*" -nav2_msgs = "*" -geometry_msgs = "*" -std_msgs = "*" -builtin_interfaces = { version = "2.0.3" } +ros-env = "0.2.0" + mapf_post = { git = "https://github.com/arjo129/mapf_post", branch="arjo/feat/more_efficient_checks"} rmf_participant_discovery = { path = "../../rmf_participant_discovery" } diff --git a/path_server/rmf_plan_executor/src/lib.rs b/path_server/rmf_plan_executor/src/lib.rs index 16ce760..1ef2bea 100644 --- a/path_server/rmf_plan_executor/src/lib.rs +++ b/path_server/rmf_plan_executor/src/lib.rs @@ -12,18 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -use geometry_msgs::msg::Pose; use mapf_post::{ na::{Isometry2, Vector2}, spatial_allocation::{CurrentPosition, Grid2D}, MapfResult, WaypointFollower, }; -use nav2_msgs::msg::Costmap; -use nav_msgs::msg::Odometry; use rclrs::{IntoPrimitiveOptions, Node}; -use rmf_prototype_msgs::msg::{ +use ros_env::builtin_interfaces; +use ros_env::geometry_msgs::msg::Pose; +use ros_env::nav2_msgs; +use ros_env::nav2_msgs::msg::Costmap; +use ros_env::nav_msgs::msg::Odometry; +use ros_env::rmf_prototype_msgs; +use ros_env::rmf_prototype_msgs::msg::{ DestinationConstraints, Plan, PlanRelease, SafeZone, SafeZoneId, TargetOrientation, }; +use ros_env::std_msgs; use std::{ collections::{BTreeMap, HashMap}, sync::Arc, @@ -525,7 +529,6 @@ impl PlanExecutor { #[cfg(test)] mod tests { - use super::*; use mapf_post::na::{Isometry2, Vector2}; use mapf_post::{Trajectory, WaypointFollower}; diff --git a/path_server/rmf_plan_executor/src/main.rs b/path_server/rmf_plan_executor/src/main.rs index e3e8220..1bb2c1d 100644 --- a/path_server/rmf_plan_executor/src/main.rs +++ b/path_server/rmf_plan_executor/src/main.rs @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -use nav_msgs::msg::Odometry; use rclrs::{Context, CreateBasicExecutor, IntoPrimitiveOptions, SpinOptions}; use rmf_plan_executor::PlanExecutor; -use rmf_prototype_msgs::msg::{ParticipantList, Plan}; +use ros_env::nav_msgs::msg::Odometry; +use ros_env::rmf_prototype_msgs::msg::{ParticipantList, Plan}; use std::collections::HashMap; struct RobotConnections { diff --git a/rmf_participant_discovery/Cargo.toml b/rmf_participant_discovery/Cargo.toml index c64c8a6..b12f09b 100644 --- a/rmf_participant_discovery/Cargo.toml +++ b/rmf_participant_discovery/Cargo.toml @@ -5,4 +5,4 @@ edition = "2021" [dependencies] rclrs = "*" -rmf_prototype_msgs = "*" +ros-env = "0.2.0" diff --git a/rmf_participant_discovery/src/lib.rs b/rmf_participant_discovery/src/lib.rs index bd3101f..89d4fac 100644 --- a/rmf_participant_discovery/src/lib.rs +++ b/rmf_participant_discovery/src/lib.rs @@ -13,7 +13,7 @@ // limitations under the License. use rclrs::IntoPrimitiveOptions; -use rmf_prototype_msgs::msg::ParticipantList; +use ros_env::rmf_prototype_msgs::msg::ParticipantList; use std::collections::HashSet; #[derive(Debug, Clone, Default)] @@ -101,7 +101,7 @@ where #[cfg(test)] mod tests { use super::*; - use rmf_prototype_msgs::msg::Participant; + use ros_env::rmf_prototype_msgs::msg::Participant; #[test] fn test_participant_tracker() { From d99c5514708101f8683d00383446f79e29377508 Mon Sep 17 00:00:00 2001 From: Arjo Chakravarty Date: Wed, 24 Jun 2026 07:07:57 +0000 Subject: [PATCH 26/31] Re-add colcon-ros-cargo Signed-off-by: Arjo Chakravarty --- docker/Dockerfile.base | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base index 01f3181..a687ba7 100644 --- a/docker/Dockerfile.base +++ b/docker/Dockerfile.base @@ -18,6 +18,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ pkg-config \ && rm -rf /var/lib/apt/lists/* +# Install colcon extensions for Rust +RUN pip3 install --no-cache-dir --break-system-packages colcon-ros-cargo + # Install Rust toolchain (Stable) and global Cargo tools accessible to all users ENV RUSTUP_HOME=/usr/local/rustup \ CARGO_HOME=/usr/local/cargo \ From f784b07c719846c091126093c0710900b8dc7e7b Mon Sep 17 00:00:00 2001 From: Arjo Chakravarty Date: Wed, 24 Jun 2026 07:23:12 +0000 Subject: [PATCH 27/31] update readme since vcs is no longer needed Signed-off-by: Arjo Chakravarty --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5f309b1..2f6e0e0 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ on discourse. curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh # Install required system packages - sudo apt install -y git libclang-dev python3-pip python3-vcstool + sudo apt install -y git libclang-dev python3-pip # Install colcon plugins for Rust sudo apt install python3-colcon-cargo From 25eb2f66e4a9fcdca14892f09f26d89fcdbebd30 Mon Sep 17 00:00:00 2001 From: Arjo Chakravarty Date: Wed, 24 Jun 2026 07:30:10 +0000 Subject: [PATCH 28/31] Dockerfile base Signed-off-by: Arjo Chakravarty --- docker/Dockerfile.base | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base index a687ba7..6cfdf25 100644 --- a/docker/Dockerfile.base +++ b/docker/Dockerfile.base @@ -4,19 +4,20 @@ FROM ros:jazzy-ros-base ENV DEBIAN_FRONTEND=noninteractive # Install core build dependencies, Rust prerequisites, and ROS 2 build tools -RUN apt-get update && apt-get install -y --no-install-recommends \ - curl \ - git \ - python3-pip \ - python3-vcstool \ - clang \ - libclang-dev \ - build-essential \ - python3-colcon-common-extensions \ - python3-colcon-cargo\ - libssl-dev \ - pkg-config \ - && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get upgrade && \ + apt-get install -y --no-install-recommends \ + curl \ + git \ + python3-pip \ + python3-vcstool \ + clang \ + libclang-dev \ + build-essential \ + python3-colcon-common-extensions \ + python3-colcon-cargo\ + libssl-dev \ + pkg-config \ + && rm -rf /var/lib/apt/lists/* # Install colcon extensions for Rust RUN pip3 install --no-cache-dir --break-system-packages colcon-ros-cargo @@ -40,7 +41,7 @@ COPY . /tmp/next_gen_prototype RUN apt-get update && \ rosdep init || true && \ rosdep update && \ - rosdep install --from-paths /tmp/next_gen_prototype --ignore-src -y --skip-keys="rclrs ament_cargo ament_python" && \ + rosdep install --from-paths /tmp/next_gen_prototype --ignore-src -yr --skip-keys="rclrs ament_cargo ament_python" && \ rm -rf /var/lib/apt/lists/* && \ rm -rf /tmp/next_gen_prototype From de2fb74efd70f5426d19cd024a3466cb5afc8fca Mon Sep 17 00:00:00 2001 From: Arjo Chakravarty Date: Wed, 24 Jun 2026 07:32:26 +0000 Subject: [PATCH 29/31] Force upgrade Signed-off-by: Arjo Chakravarty --- docker/Dockerfile.base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base index 6cfdf25..122af87 100644 --- a/docker/Dockerfile.base +++ b/docker/Dockerfile.base @@ -4,7 +4,7 @@ FROM ros:jazzy-ros-base ENV DEBIAN_FRONTEND=noninteractive # Install core build dependencies, Rust prerequisites, and ROS 2 build tools -RUN apt-get update && apt-get upgrade && \ +RUN apt-get update && apt-get upgrade -y && \ apt-get install -y --no-install-recommends \ curl \ git \ From 677135e8cdc2e4d1fe017c9a34f9904a94abd062 Mon Sep 17 00:00:00 2001 From: Arjo Chakravarty Date: Wed, 24 Jun 2026 07:55:48 +0000 Subject: [PATCH 30/31] Add break-system package line Signed-off-by: Arjo Chakravarty --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2f6e0e0..14c4942 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,8 @@ on discourse. sudo apt install -y git libclang-dev python3-pip # Install colcon plugins for Rust - sudo apt install python3-colcon-cargo + sudo apt install python3-colcon-cargo + pip3 install --break-system-packages colcon-ros-cargo ``` **Method 2: Using a container** From 725ee7b1373e49bf3517b079ce0bea5c7aa24d55 Mon Sep 17 00:00:00 2001 From: Arjo Chakravarty Date: Wed, 24 Jun 2026 10:19:18 +0000 Subject: [PATCH 31/31] Limit to only epic branch Signed-off-by: Arjo Chakravarty --- .github/workflows/build_base.yml | 2 +- .github/workflows/ci.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_base.yml b/.github/workflows/build_base.yml index 2a7f12c..1ce6628 100644 --- a/.github/workflows/build_base.yml +++ b/.github/workflows/build_base.yml @@ -2,7 +2,7 @@ name: Build and Publish Base Container on: push: - branches: [ arjoc/feat/ci_config_next_gen, epic/next-gen-base ] + branches: [ epic/next-gen-base ] paths: - 'docker/Dockerfile.base' - 'docker/base.repos' diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 15d78e6..d8a117e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,9 +2,9 @@ name: Next-Gen Prototype CI on: push: - branches: [ epic/next-gen-base, arjoc/feat/ci_config_next_gen ] + branches: [ epic/next-gen-base ] pull_request: - branches: [ epic/next-gen-base, arjoc/feat/ci_config_next_gen ] + branches: [ epic/next-gen-base ] jobs: ci-check: