Fix merge conflicts

ros-controls · Feb 15, 2024 · bfa39da · bfa39da
1 parent 4412f89
commit bfa39da
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 40 deletions.
diff --git a/.github/workflows/iron-rhel-semi-binary-build.yml b/.github/workflows/iron-rhel-semi-binary-build.yml
@@ -12,26 +12,9 @@ on:
 jobs:
   iron_rhel_binary:
     name: Iron RHEL binary build
-<<<<<<< HEAD:.github/workflows/iron-rhel-binary-build.yml
-    runs-on: ubuntu-latest
-    env:
-      ROS_DISTRO: iron
-    container: ghcr.io/ros-controls/ros:iron-rhel
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          path: src/ros2_controllers
-      - run: |
-          rosdep update
-          rosdep install -iy --from-path src/ros2_controllers
-          source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash
-          colcon build
-          colcon test
-=======
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-rhel-binary-build.yml@master
     with:
       ros_distro: iron
       upstream_workspace: ros2_controllers.iron.repos
       ref_for_scheduled_build: iron
       skip_packages: rqt_joint_trajectory_controller
->>>>>>> cb6884a (Use reusable wfs from ros2_control_ci and use matrix strategy (#1040)):.github/workflows/iron-rhel-semi-binary-build.yml
diff --git a/.github/workflows/rolling-rhel-semi-binary-build.yml b/.github/workflows/rolling-rhel-semi-binary-build.yml
@@ -1,8 +1,4 @@
-<<<<<<< HEAD:.github/workflows/rolling-rhel-binary-build.yml
-name: Rolling RHEL Binary Build
-=======
 name: RHEL Rolling Semi-Binary Build
->>>>>>> cb6884a (Use reusable wfs from ros2_control_ci and use matrix strategy (#1040)):.github/workflows/rolling-rhel-semi-binary-build.yml
 on:
   workflow_dispatch:
   push:
@@ -14,29 +10,10 @@ on:
 
 
 jobs:
-<<<<<<< HEAD:.github/workflows/rolling-rhel-binary-build.yml
-  rolling_rhel_binary:
-    name: Rolling RHEL binary build
-    runs-on: ubuntu-latest
-    env:
-      ROS_DISTRO: rolling
-    container: ghcr.io/ros-controls/ros:rolling-rhel
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          path: src/ros2_controllers
-      - run: |
-          rosdep update
-          rosdep install -iy --from-path src/ros2_controllers
-          source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash
-          colcon build
-          colcon test
-=======
   rolling_rhel:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-rhel-binary-build.yml@master
     with:
       ros_distro: rolling
       upstream_workspace: ros2_controllers.rolling.repos
       ref_for_scheduled_build: master
       skip_packages: rqt_joint_trajectory_controller
->>>>>>> cb6884a (Use reusable wfs from ros2_control_ci and use matrix strategy (#1040)):.github/workflows/rolling-rhel-semi-binary-build.yml