From 1172955ef61070b10f984b0555b431e13f5a263f Mon Sep 17 00:00:00 2001 From: Simon Hoinkis Date: Mon, 4 Dec 2023 12:09:12 +0100 Subject: [PATCH] iox-#2099 Update integration tests script Signed-off-by: Simon Hoinkis --- .github/workflows/build-test.yml | 2 +- tools/ci/run-integration-test.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index ba82255bded..73625155651 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -67,7 +67,7 @@ jobs: - name: Setup ROS uses: ros-tooling/setup-ros@v0.7 with: - required-ros-distributions: iron + required-ros-distributions: humble - uses: actions/checkout@v2 - run: ./tools/ci/run-integration-test.sh diff --git a/tools/ci/run-integration-test.sh b/tools/ci/run-integration-test.sh index d0dcc3b5a11..e47c9ad119e 100755 --- a/tools/ci/run-integration-test.sh +++ b/tools/ci/run-integration-test.sh @@ -29,17 +29,17 @@ cd "${WORKSPACE}" msg "installing dependencies" # NOTE: github action ros-tooling/setup-ros@0.2.1 should be run before sudo apt install -y apt-transport-https -sudo apt update && sudo apt install -y cmake libacl1-dev libncurses5-dev pkg-config ros-foxy-ros-testing +sudo apt update && sudo apt install -y cmake libacl1-dev libncurses5-dev pkg-config ros-humble-ros-testing msg "sourcing ROS workspace" # shellcheck source=/dev/null -source /opt/ros/foxy/setup.bash +source /opt/ros/humble/setup.bash msg "checking copyrights" -sudo rm -rf /opt/ros/foxy/lib/python3.8/site-packages/ament_copyright/template/apache2_header.txt -sudo cp -rf tools/apache2_header.txt /opt/ros/foxy/lib/python3.8/site-packages/ament_copyright/template/. +sudo rm -rf /opt/ros/humble/lib/python3.10/site-packages/ament_copyright/template/apache2_header.txt +sudo cp -rf tools/apache2_header.txt /opt/ros/humble/lib/python3.10/site-packages/ament_copyright/template/. # shellcheck disable=SC2026 -sudo sed -i '41 c\"'c'", "'cc'", "'cpp'", "'cxx'", "'h'", "'hh'", "'hpp'", "'hxx'", "'inl'", "'sh'"' /opt/ros/foxy/lib/python3.8/site-packages/ament_copyright/main.py +sudo sed -i '41 c\"'c'", "'cc'", "'cpp'", "'cxx'", "'h'", "'hh'", "'hpp'", "'hxx'", "'inl'", "'sh'"' /opt/ros/humble/lib/python3.10/site-packages/ament_copyright/main.py ament_copyright --exclude LICENSE CONTRIBUTING.md tools/apache2_header.txt msg "compiler versions: