From 32f8788779a6cb08ab0238f194ef1006cc57ada0 Mon Sep 17 00:00:00 2001 From: "Dr. Denis" Date: Tue, 23 Jan 2024 12:07:41 +0100 Subject: [PATCH] Fix merge conflicts --- .github/workflows/humble-rhel-binary-build.yml | 7 ------- .github/workflows/rolling-rhel-binary-build.yml | 7 ------- 2 files changed, 14 deletions(-) diff --git a/.github/workflows/humble-rhel-binary-build.yml b/.github/workflows/humble-rhel-binary-build.yml index cbe47d0948..ed37092520 100644 --- a/.github/workflows/humble-rhel-binary-build.yml +++ b/.github/workflows/humble-rhel-binary-build.yml @@ -22,12 +22,6 @@ jobs: - name: Install dependencies run: | rosdep update -<<<<<<< HEAD - rosdep install -iy --from-path src/ros2_control - source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash - colcon build - colcon test -======= rosdep install -iyr --from-path src/ros2_control || true - name: Build and test run: | @@ -35,4 +29,3 @@ jobs: colcon build --packages-skip rqt_controller_manager colcon test --packages-skip rqt_controller_manager ros2controlcli colcon test-result --verbose ->>>>>>> fd2cc4e ([RHEL-CI] Rename workflow and don't run on push (#1326)) diff --git a/.github/workflows/rolling-rhel-binary-build.yml b/.github/workflows/rolling-rhel-binary-build.yml index 1490221c4e..06a5411c24 100644 --- a/.github/workflows/rolling-rhel-binary-build.yml +++ b/.github/workflows/rolling-rhel-binary-build.yml @@ -23,12 +23,6 @@ jobs: - name: Install dependencies run: | rosdep update -<<<<<<< HEAD - rosdep install -iy --from-path src/ros2_control - source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash - colcon build - colcon test -======= rosdep install -iyr --from-path src/ros2_control || true - name: Build and test run: | @@ -36,4 +30,3 @@ jobs: colcon build --packages-skip rqt_controller_manager colcon test --packages-skip rqt_controller_manager ros2controlcli colcon test-result --verbose ->>>>>>> fd2cc4e ([RHEL-CI] Rename workflow and don't run on push (#1326))