From 78f14105eb46770b65baff20ee518c43a547540f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Fri, 2 Feb 2024 13:50:28 +0100 Subject: [PATCH] [CI] Fix source build (#176) --- .github/workflows/build-source_rollling.yml | 2 +- .github/workflows/humble-rhel-binary-build.yml | 2 +- .github/workflows/iron-rhel-binary-build.yml | 2 +- .github/workflows/rolling-rhel-binary-build.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-source_rollling.yml b/.github/workflows/build-source_rollling.yml index edec1963..14dacac0 100644 --- a/.github/workflows/build-source_rollling.yml +++ b/.github/workflows/build-source_rollling.yml @@ -13,5 +13,5 @@ jobs: uses: ./.github/workflows/reusable-ros-tooling-source-build.yml with: ros_distro: rolling - ref: master + ref: ros2-master ros2_repo_branch: rolling diff --git a/.github/workflows/humble-rhel-binary-build.yml b/.github/workflows/humble-rhel-binary-build.yml index 1d9de995..4851a834 100644 --- a/.github/workflows/humble-rhel-binary-build.yml +++ b/.github/workflows/humble-rhel-binary-build.yml @@ -21,7 +21,7 @@ jobs: path: src/control_toolbox - name: Install dependencies run: | - rosdep update + rosdep update --rosdistro $ROS_DISTRO rosdep install -iyr --from-path src/control_toolbox || true - name: Build and test run: | diff --git a/.github/workflows/iron-rhel-binary-build.yml b/.github/workflows/iron-rhel-binary-build.yml index 4a6514bd..be517fb6 100644 --- a/.github/workflows/iron-rhel-binary-build.yml +++ b/.github/workflows/iron-rhel-binary-build.yml @@ -22,7 +22,7 @@ jobs: path: src/control_toolbox - name: Install dependencies run: | - rosdep update + rosdep update --rosdistro $ROS_DISTRO rosdep install -iyr --from-path src/control_toolbox || true - name: Build and test # source also underlay workspace with generate_parameter_library on rhel9 diff --git a/.github/workflows/rolling-rhel-binary-build.yml b/.github/workflows/rolling-rhel-binary-build.yml index c4719919..c4ec45d4 100644 --- a/.github/workflows/rolling-rhel-binary-build.yml +++ b/.github/workflows/rolling-rhel-binary-build.yml @@ -22,7 +22,7 @@ jobs: path: src/control_toolbox - name: Install dependencies run: | - rosdep update + rosdep update --rosdistro $ROS_DISTRO rosdep install -iyr --from-path src/control_toolbox || true - name: Build and test # source also underlay workspace with generate_parameter_library on rhel9