From acbcaad6d354d5190dcdf312714cf909720c72a9 Mon Sep 17 00:00:00 2001 From: David Laseca Perez Date: Mon, 14 Sep 2026 11:54:19 +0200 Subject: [PATCH] Bump ubuntu on rolling Signed-off-by: David Laseca Perez --- .github/ISSUE_TEMPLATE/general-issue.md | 2 +- .github/workflows/ci.yml | 42 ++++++++++++++++--------- README.md | 8 +++-- config/raspbian/generic/configure.sh | 2 +- 4 files changed, 34 insertions(+), 20 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/general-issue.md b/.github/ISSUE_TEMPLATE/general-issue.md index 3ac587d1..5c932a44 100644 --- a/.github/ISSUE_TEMPLATE/general-issue.md +++ b/.github/ISSUE_TEMPLATE/general-issue.md @@ -12,7 +12,7 @@ assignees: '' - Hardware description: - RTOS: - Installation type: -- Version or commit hash: +- Version or commit hash: #### Steps to reproduce the issue diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index feef92c5..b91e0faa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,18 +15,22 @@ jobs: micro_ros_build: runs-on: ubuntu-latest container: - image: ubuntu:24.04 + image: ubuntu:26.04 strategy: fail-fast: false steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 with: path: src/micro_ros_setup ref: ${{ inputs.ci_target_ref }} - - uses: ros-tooling/setup-ros@0.7.13 + - uses: ros-tooling/setup-ros@0.7.19 with: - use-ros2-testing: false + # Rolling binaries for Ubuntu Resolute are only published to the + # ros2-testing repository; the main repository currently ships + # Lyrical only + # Revert once Rolling syncs to the main repository + use-ros2-testing: true required-ros-distributions: ${{ env.ROS_DISTRO }} - name: Dependencies @@ -51,7 +55,7 @@ jobs: echo "sanitized_name=$sanitized_name" >> $GITHUB_ENV echo "::set-output name=sanitized_name::$sanitized_name" - - uses: actions/upload-artifact@v4.4.0 + - uses: actions/upload-artifact@v7.0.1 with: name: micro_ros_build_${{ steps.sanitize-name.outputs.sanitized_name }} path: install @@ -59,20 +63,24 @@ jobs: micro_ros_agent: runs-on: ubuntu-latest container: - image: ubuntu:24.04 + image: ubuntu:26.04 strategy: fail-fast: false needs: micro_ros_build steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 with: path: src/micro_ros_setup ref: ${{ inputs.ci_target_ref }} - - uses: ros-tooling/setup-ros@0.7.13 + - uses: ros-tooling/setup-ros@0.7.19 with: - use-ros2-testing: false + # Rolling binaries for Ubuntu Resolute are only published to the + # ros2-testing repository; the main repository currently ships + # Lyrical only + # Revert once Rolling syncs to the main repository + use-ros2-testing: true required-ros-distributions: ${{ env.ROS_DISTRO }} - name: dependencies @@ -89,7 +97,7 @@ jobs: echo "sanitized_name=$sanitized_name" >> $GITHUB_ENV echo "::set-output name=sanitized_name::$sanitized_name" - - uses: actions/download-artifact@v4.1.7 + - uses: actions/download-artifact@v8.0.1 with: name: micro_ros_build_${{ steps.sanitize-name.outputs.sanitized_name }} path: install @@ -113,7 +121,7 @@ jobs: runs-on: ubuntu-latest needs: micro_ros_build container: - image: ubuntu:24.04 + image: ubuntu:26.04 strategy: fail-fast: false matrix: @@ -214,14 +222,18 @@ jobs: binary: 'firmware/bin/weather_publisher' steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 with: path: src/micro_ros_setup ref: ${{ inputs.ci_target_ref }} - - uses: ros-tooling/setup-ros@0.7.13 + - uses: ros-tooling/setup-ros@0.7.19 with: - use-ros2-testing: false + # Rolling binaries for Ubuntu Resolute are only published to the + # ros2-testing repository; the main repository currently ships + # Lyrical only + # Revert once Rolling syncs to the main repository + use-ros2-testing: true required-ros-distributions: ${{ env.ROS_DISTRO }} - name: Dependencies @@ -238,7 +250,7 @@ jobs: echo "sanitized_name=$sanitized_name" >> $GITHUB_ENV echo "::set-output name=sanitized_name::$sanitized_name" - - uses: actions/download-artifact@v4.1.7 + - uses: actions/download-artifact@v8.0.1 with: name: micro_ros_build_${{ steps.sanitize-name.outputs.sanitized_name }} path: install diff --git a/README.md b/README.md index 8dd81cf6..4d5dae99 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ This package provides tools and utils to crosscompile micro-ROS with just the co | [Zephyr](https://www.zephyrproject.org/) | [ST Nucleo H743ZI](https://www.st.com/en/evaluation-tools/nucleo-h743zi.html) 1 | v2.6.0 | `zephyr nucleo_h743zi` | **[micro-ROS module for Zephyr RTOS](https://github.com/micro-ROS/micro_ros_zephyr_module)** | | [Zephyr](https://www.zephyrproject.org/) | [Zephyr emulator](https://docs.zephyrproject.org/2.3.0/boards/posix/native_posix/doc/index.html) | v2.6.0 | `zephyr host` | **[micro-ROS module for Zephyr RTOS](https://github.com/micro-ROS/micro_ros_zephyr_module)** | | - | Static library (.a) and headers (.h) 3 | - | `generate_lib` | | -| Linux | *Host 2* | Ubuntu 18.04/20.04 | `host` | | +| Linux | *Host 2* | Ubuntu 26.04 | `host` | | | Android | [AOSP](https://source.android.com) 1 | Latest | `android generic` | | *1 Community supported, may have lack of official support* @@ -86,7 +86,9 @@ This package targets the **ROS 2** installation. ROS 2 supported distributions a | Foxy | EOL | `foxy` | | Galactic | EOL | `galactic` | | Humble | Supported | `humble` | -| Iron | Supported | `iron` | +| Iron | EOL | `iron` | +| Jazzy | Supported | `jazzy` | +| Kilted | Supported | `kilted` | | Rolling | Supported | `rolling` | Some other prerequisites needed for building a firmware using this package are: @@ -113,7 +115,7 @@ source /opt/ros/$ROS_DISTRO/setup.bash mkdir uros_ws && cd uros_ws -git clone -b rolling https://github.com/micro-ROS/micro_ros_setup.git src/micro_ros_setup +git clone -b $ROS_DISTRO https://github.com/micro-ROS/micro_ros_setup.git src/micro_ros_setup rosdep update && rosdep install --from-paths src --ignore-src -y diff --git a/config/raspbian/generic/configure.sh b/config/raspbian/generic/configure.sh index c3c6b669..002c29f7 100755 --- a/config/raspbian/generic/configure.sh +++ b/config/raspbian/generic/configure.sh @@ -4,7 +4,7 @@ pushd $FW_TARGETDIR >/dev/null rm -rf mcu_ws/* cp raspbian_apps/toolchain.cmake mcu_ws/ # ROS_DISTRO SPECIFIC - curl -s https://raw.githubusercontent.com/ros2/ros2/kilted/ros2.repos |\ + curl -s https://raw.githubusercontent.com/ros2/ros2/rolling/ros2.repos |\ ros2 run micro_ros_setup yaml_filter.py raspbian_apps/$CONFIG_NAME/ros2_repos.filter > ros2.repos vcs import --input ros2.repos mcu_ws/ && rm ros2.repos