From 79c301458f1bbe232f0f24624db1d430989112c9 Mon Sep 17 00:00:00 2001 From: wep21 Date: Fri, 26 Jul 2024 04:17:28 +0900 Subject: [PATCH 1/2] update repos Signed-off-by: wep21 --- tools/ros2_dependencies.repos | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/ros2_dependencies.repos b/tools/ros2_dependencies.repos index 23d88992..168c7f12 100644 --- a/tools/ros2_dependencies.repos +++ b/tools/ros2_dependencies.repos @@ -1,6 +1,5 @@ repositories: ros-planning/navigation2: type: git - # back to upstream main after https://github.com/ros-navigation/navigation2/pull/4298 is merged - url: https://github.com/tonynajjar/navigation2.git - version: fix-devcontainer + url: https://github.com/ros-navigation/navigation2.git + version: main From b234d1a70cb7ddec0ec5de6c9aa2a245a0d44762 Mon Sep 17 00:00:00 2001 From: wep21 Date: Fri, 26 Jul 2024 04:21:52 +0900 Subject: [PATCH 2/2] update build actions Signed-off-by: wep21 --- .github/workflows/colcon.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/colcon.yaml b/.github/workflows/colcon.yaml index e753651d..52f098e1 100644 --- a/.github/workflows/colcon.yaml +++ b/.github/workflows/colcon.yaml @@ -10,13 +10,14 @@ on: - '*' jobs: build-test: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest strategy: fail-fast: false matrix: config: - - {rosdistro: 'rolling', container: 'ros:rolling'} - container: ${{ matrix.config.container }} + - {rosdistro: 'rolling', container: 'rostooling/setup-ros-docker:ubuntu-noble-ros-rolling-desktop-latest'} + container: + image: ${{ matrix.config.container }} steps: - uses: actions/checkout@v4 with: @@ -32,7 +33,7 @@ jobs: apt update rosdep update source /opt/ros/${{matrix.config.rosdistro}}/setup.bash - rosdep install --from-paths src --ignore-src -y --skip-keys "slam_toolbox turtlebot3_gazebo gazebo_ros_pkgs octomap_server" + rosdep install --from-paths src --ignore-src -y --skip-keys "slam_toolbox" shell: bash - name: Colcon Build (Release) run: |