From 76cec3cde623ca807b5d0ca2d09a569ff79cc05a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathias=20L=C3=BCdtke?= <727227+mathias-luedtke@users.noreply.github.com> Date: Mon, 11 Mar 2024 00:03:59 +0100 Subject: [PATCH] Support running rolling tests on jammy --- .github/workflows/main.yml | 11 ++++++++++- industrial_ci/src/ros.sh | 6 ++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 931204fd5..0454b7ace 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -41,7 +41,12 @@ jobs: - galactic - humble - iron - - rolling + include: + - distro: rolling + ubuntu: jammy + include: + - distro: rolling + ubuntu: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -49,6 +54,10 @@ jobs: run: | echo "BEFORE_BUILD_TARGET_WORKSPACE=sed -i /condition/d /root/target_ws/src/industrial_ci/industrial_ci/package.xml" >> "$GITHUB_ENV" if: matrix.distro == 'ardent' + - name: set OS_CODE_NAME + run: | + echo "OS_CODE_NAME=${{ matrix.ubuntu }}" >> "$GITHUB_ENV" + if: ${{ matrix.ubuntu }} - uses: './' env: ROS_DISTRO: ${{ matrix.distro }} diff --git a/industrial_ci/src/ros.sh b/industrial_ci/src/ros.sh index 0077c42bb..9fcaf88ae 100644 --- a/industrial_ci/src/ros.sh +++ b/industrial_ci/src/ros.sh @@ -96,6 +96,12 @@ function _set_ros_defaults { ;; "rolling") _ros2_defaults "noble" + if [ "$OS_CODE_NAME" == "jammy" ]; then + if [ -z "$ROSDISTRO_INDEX_VERSION" ]; then + ici_warn "Pinning rolling to latest support version on jammy: 2024-02-28" + export ROSDISTRO_INDEX_VERSION=rolling/2024-02-28 + fi + fi ;; "false") unset ROS_DISTRO