From 0e34a3efbdec7c70296857c5da1eea28eac9c4b5 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Thu, 28 Mar 2024 15:43:15 -0500 Subject: [PATCH 1/6] Keep rolling on Jammy and apply a temporary fix for rosdep Signed-off-by: Addisu Z. Taddese --- .github/workflows/ros2-ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ros2-ci.yml b/.github/workflows/ros2-ci.yml index e06727b6..d9cb98e4 100644 --- a/.github/workflows/ros2-ci.yml +++ b/.github/workflows/ros2-ci.yml @@ -10,25 +10,26 @@ jobs: fail-fast: false matrix: include: - - docker-image: "ubuntu:24.04" + - docker-image: "ubuntu:22.04" gz-version: "garden" ros-distro: "rolling" - - docker-image: "ubuntu:24.04" + - docker-image: "ubuntu:22.04" gz-version: "harmonic" ros-distro: "rolling" container: image: ${{ matrix.docker-image }} steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Build and Test run: .github/workflows/build-and-test.sh env: DOCKER_IMAGE: ${{ matrix.docker-image }} GZ_VERSION: ${{ matrix.gz-version }} ROS_DISTRO: ${{ matrix.ros-distro }} + ROSDISTRO_INDEX_URL: https://raw.githubusercontent.com/ros/rosdistro/rolling/2024-03-13/index-v4.yaml # Temporarily pin rosdep to fix rolling on Jammy - name: Build sdformat_urdf from source - uses: actions/checkout@v2 + uses: actions/checkout@v4 if: ${{ matrix.gz-version }} == "garden" with: repository: ros/sdformat_urdf From 963b52ab5e07914c9bffc3c8e4407f417592e9c7 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Thu, 28 Mar 2024 16:09:14 -0500 Subject: [PATCH 2/6] Try a different approach Signed-off-by: Addisu Z. Taddese --- .github/workflows/build-and-test.sh | 7 +++++++ .github/workflows/ros2-ci.yml | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.sh b/.github/workflows/build-and-test.sh index e7aaf2f9..2515163b 100755 --- a/.github/workflows/build-and-test.sh +++ b/.github/workflows/build-and-test.sh @@ -27,6 +27,13 @@ elif [ "$GZ_VERSION" == "harmonic" ]; then ROSDEP_ARGS="--skip-keys='sdformat-urdf'" fi +# Temporarily pin rosdep to fix CI on rolling +( + cd /tmp/ + git clone https://github.com/ros/rosdistro/ -b rolling/2024-03-13 +) +export ROSDISTRO_INDEX_URL=file:///tmp/rosdistro/index-v4.yaml + # Fortress comes through rosdep for Focal and Jammy # Dependencies. diff --git a/.github/workflows/ros2-ci.yml b/.github/workflows/ros2-ci.yml index d9cb98e4..331de86c 100644 --- a/.github/workflows/ros2-ci.yml +++ b/.github/workflows/ros2-ci.yml @@ -27,7 +27,6 @@ jobs: DOCKER_IMAGE: ${{ matrix.docker-image }} GZ_VERSION: ${{ matrix.gz-version }} ROS_DISTRO: ${{ matrix.ros-distro }} - ROSDISTRO_INDEX_URL: https://raw.githubusercontent.com/ros/rosdistro/rolling/2024-03-13/index-v4.yaml # Temporarily pin rosdep to fix rolling on Jammy - name: Build sdformat_urdf from source uses: actions/checkout@v4 if: ${{ matrix.gz-version }} == "garden" From 3421371bdffe8196c161d940a5cb312f286b36c3 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Thu, 28 Mar 2024 16:11:11 -0500 Subject: [PATCH 3/6] Install git Signed-off-by: Addisu Z. Taddese --- .github/workflows/build-and-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.sh b/.github/workflows/build-and-test.sh index 2515163b..9d8ed0c1 100755 --- a/.github/workflows/build-and-test.sh +++ b/.github/workflows/build-and-test.sh @@ -8,7 +8,7 @@ export DEBIAN_FRONTEND=noninteractive export ROS_PYTHON_VERSION=3 apt update -qq -apt install -qq -y lsb-release wget curl build-essential +apt install -qq -y lsb-release wget curl build-essential git if [ "$GZ_VERSION" == "garden" ]; then echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-stable.list From 75e0aac31b4ceb61facde10f5cee275155f5a5d6 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Thu, 28 Mar 2024 16:20:51 -0500 Subject: [PATCH 4/6] Yet another approach Signed-off-by: Addisu Z. Taddese --- .github/workflows/build-and-test.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-and-test.sh b/.github/workflows/build-and-test.sh index 9d8ed0c1..d45696fa 100755 --- a/.github/workflows/build-and-test.sh +++ b/.github/workflows/build-and-test.sh @@ -27,13 +27,6 @@ elif [ "$GZ_VERSION" == "harmonic" ]; then ROSDEP_ARGS="--skip-keys='sdformat-urdf'" fi -# Temporarily pin rosdep to fix CI on rolling -( - cd /tmp/ - git clone https://github.com/ros/rosdistro/ -b rolling/2024-03-13 -) -export ROSDISTRO_INDEX_URL=file:///tmp/rosdistro/index-v4.yaml - # Fortress comes through rosdep for Focal and Jammy # Dependencies. @@ -45,6 +38,11 @@ apt-get install -y $GZ_DEPS \ python3-rosdep rosdep init +# Temporarily pin rosdep to fix CI on rolling +sed -i "s|ros\/rosdistro\/master|ros\/rosdistro\/rolling\/2024-03-13|" /etc/ros/rosdep/sources.list.d/20-default.list +export ROSDISTRO_INDEX_URL=https://raw.githubusercontent.com/ros/rosdistro/rolling/2024-03-13/index-v4.yaml +# end Temporary fix + rosdep update rosdep install --from-paths ./ -i -y -r --rosdistro $ROS_DISTRO $ROSDEP_ARGS From 23f49f2c65375b14130eb98f3a5be23bcdc7969c Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Thu, 28 Mar 2024 16:41:51 -0500 Subject: [PATCH 5/6] Try initial approach with correct tag Signed-off-by: Addisu Z. Taddese --- .github/workflows/build-and-test.sh | 5 ----- .github/workflows/ros2-ci.yml | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/build-and-test.sh b/.github/workflows/build-and-test.sh index d45696fa..ba628baa 100755 --- a/.github/workflows/build-and-test.sh +++ b/.github/workflows/build-and-test.sh @@ -38,11 +38,6 @@ apt-get install -y $GZ_DEPS \ python3-rosdep rosdep init -# Temporarily pin rosdep to fix CI on rolling -sed -i "s|ros\/rosdistro\/master|ros\/rosdistro\/rolling\/2024-03-13|" /etc/ros/rosdep/sources.list.d/20-default.list -export ROSDISTRO_INDEX_URL=https://raw.githubusercontent.com/ros/rosdistro/rolling/2024-03-13/index-v4.yaml -# end Temporary fix - rosdep update rosdep install --from-paths ./ -i -y -r --rosdistro $ROS_DISTRO $ROSDEP_ARGS diff --git a/.github/workflows/ros2-ci.yml b/.github/workflows/ros2-ci.yml index 331de86c..1732131e 100644 --- a/.github/workflows/ros2-ci.yml +++ b/.github/workflows/ros2-ci.yml @@ -27,6 +27,7 @@ jobs: DOCKER_IMAGE: ${{ matrix.docker-image }} GZ_VERSION: ${{ matrix.gz-version }} ROS_DISTRO: ${{ matrix.ros-distro }} + ROSDISTRO_INDEX_URL: https://raw.githubusercontent.com/ros/rosdistro/rolling/2024-02-28/index-v4.yaml # Temporarily pin rosdep to fix rolling on Jammy - name: Build sdformat_urdf from source uses: actions/checkout@v4 if: ${{ matrix.gz-version }} == "garden" From 483744a65d518136c1b973ef935014a6decfb2ff Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Fri, 29 Mar 2024 12:08:25 -0500 Subject: [PATCH 6/6] Revert unnecessary change Signed-off-by: Addisu Z. Taddese --- .github/workflows/build-and-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.sh b/.github/workflows/build-and-test.sh index ba628baa..e7aaf2f9 100755 --- a/.github/workflows/build-and-test.sh +++ b/.github/workflows/build-and-test.sh @@ -8,7 +8,7 @@ export DEBIAN_FRONTEND=noninteractive export ROS_PYTHON_VERSION=3 apt update -qq -apt install -qq -y lsb-release wget curl build-essential git +apt install -qq -y lsb-release wget curl build-essential if [ "$GZ_VERSION" == "garden" ]; then echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-stable.list