Fix merge conflicts

ros-controls · Feb 15, 2024 · e27d8b1 · e27d8b1
1 parent b77ca41
commit e27d8b1
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 134 deletions.
diff --git a/.github/workflows/humble-debian-build.yml b/.github/workflows/humble-debian-build.yml
@@ -10,26 +10,6 @@ on:
 
 
 jobs:
-<<<<<<< HEAD
-  humble_debian:
-    name: Humble debian build
-    runs-on: ubuntu-latest
-    env:
-      ROS_DISTRO: humble
-    container: ghcr.io/ros-controls/ros:humble-debian
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          path: src/ros2_control
-      - name: Build and test
-        shell: bash
-        run: |
-          source /opt/ros2_ws/install/setup.bash
-          vcs import src < src/ros2_control/ros2_control.${{ env.ROS_DISTRO }}.repos
-          colcon build --packages-skip rqt_controller_manager
-          colcon test --packages-skip rqt_controller_manager control_msgs controller_manager_msgs
-          colcon test-result --verbose
-=======
   debian_source_build:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-debian-build.yml@master
     strategy:
@@ -40,5 +20,4 @@ jobs:
       upstream_workspace: ros2_control.${{ matrix.ROS_DISTRO }}.repos
       ref_for_scheduled_build: master
       skip_packages: rqt_controller_manager
-      skip_packages_test: controller_manager_msgs
->>>>>>> 3a21841 ([CI] Reusable workflows from `ros2_control_ci` (#1383))
+      skip_packages_test: controller_manager_msgs control_msgs
diff --git a/.github/workflows/humble-rhel-binary-build.yml b/.github/workflows/humble-rhel-binary-build.yml
@@ -9,28 +9,6 @@ on:
     - cron: '03 1 * * *'
 
 jobs:
-<<<<<<< HEAD
-  humble_rhel_binary:
-    name: Humble RHEL binary build
-    runs-on: ubuntu-latest
-    env:
-      ROS_DISTRO: humble
-    container: ghcr.io/ros-controls/ros:humble-rhel
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          path: src/ros2_control
-      - name: Install dependencies
-        run: |
-          rosdep update
-          rosdep install -iyr --from-path src/ros2_control || true
-      - name: Build and test
-        run: |
-          source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash
-          colcon build --packages-skip rqt_controller_manager
-          colcon test --packages-skip rqt_controller_manager ros2controlcli
-          colcon test-result --verbose
-=======
   rhel_semi_binary_build:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-rhel-binary-build.yml@master
     strategy:
@@ -41,4 +19,3 @@ jobs:
       upstream_workspace: ros2_control.${{ matrix.ROS_DISTRO }}.repos
       ref_for_scheduled_build: humble
       skip_packages: rqt_controller_manager
->>>>>>> 3a21841 ([CI] Reusable workflows from `ros2_control_ci` (#1383))
diff --git a/.github/workflows/iron-debian-build.yml b/.github/workflows/iron-debian-build.yml
@@ -10,26 +10,6 @@ on:
 
 
 jobs:
-<<<<<<< HEAD
-  iron_debian:
-    name: Iron debian build
-    runs-on: ubuntu-latest
-    env:
-      ROS_DISTRO: iron
-    container: ghcr.io/ros-controls/ros:iron-debian
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          path: src/ros2_control
-      - name: Build and test
-        shell: bash
-        run: |
-          source /opt/ros2_ws/install/setup.bash
-          vcs import src < src/ros2_control/ros2_control.${{ env.ROS_DISTRO }}.repos
-          colcon build --packages-skip rqt_controller_manager
-          colcon test --packages-skip rqt_controller_manager control_msgs controller_manager_msgs
-          colcon test-result --verbose
-=======
   debian_source_build:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-debian-build.yml@master
     strategy:
@@ -40,5 +20,4 @@ jobs:
       upstream_workspace: ros2_control.${{ matrix.ROS_DISTRO }}.repos
       ref_for_scheduled_build: master
       skip_packages: rqt_controller_manager
-      skip_packages_test: controller_manager_msgs
->>>>>>> 3a21841 ([CI] Reusable workflows from `ros2_control_ci` (#1383))
+      skip_packages_test: controller_manager_msgs control_msgs
diff --git a/.github/workflows/iron-rhel-binary-build.yml b/.github/workflows/iron-rhel-binary-build.yml
@@ -10,28 +10,6 @@ on:
 
 
 jobs:
-<<<<<<< HEAD
-  iron_rhel_binary:
-    name: Iron RHEL binary build
-    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_control
-      - name: Install dependencies
-        run: |
-          rosdep update
-          rosdep install -iyr --from-path src/ros2_control || true
-      - name: Build and test
-        run: |
-          source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash
-          colcon build --packages-skip rqt_controller_manager
-          colcon test --packages-skip rqt_controller_manager ros2controlcli
-          colcon test-result --verbose
-=======
   rhel_semi_binary_build:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-rhel-binary-build.yml@master
     strategy:
@@ -42,4 +20,3 @@ jobs:
       upstream_workspace: ros2_control.${{ matrix.ROS_DISTRO }}.repos
       ref_for_scheduled_build: iron
       skip_packages: rqt_controller_manager
->>>>>>> 3a21841 ([CI] Reusable workflows from `ros2_control_ci` (#1383))
diff --git a/.github/workflows/rolling-debian-build.yml b/.github/workflows/rolling-debian-build.yml
@@ -10,26 +10,6 @@ on:
 
 
 jobs:
-<<<<<<< HEAD
-  rolling_debian:
-    name: Rolling debian build
-    runs-on: ubuntu-latest
-    env:
-      ROS_DISTRO: rolling
-    container: ghcr.io/ros-controls/ros:rolling-debian
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          path: src/ros2_control
-      - name: Build and test
-        shell: bash
-        run: |
-          source /opt/ros2_ws/install/setup.bash
-          vcs import src < src/ros2_control/ros2_control.${{ env.ROS_DISTRO }}.repos
-          colcon build --packages-skip rqt_controller_manager
-          colcon test --packages-skip rqt_controller_manager
-          colcon test-result --verbose
-=======
   debian_source_build:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-debian-build.yml@master
     strategy:
@@ -40,4 +20,3 @@ jobs:
       upstream_workspace: ros2_control.${{ matrix.ROS_DISTRO }}.repos
       ref_for_scheduled_build: master
       skip_packages: rqt_controller_manager
->>>>>>> 3a21841 ([CI] Reusable workflows from `ros2_control_ci` (#1383))
diff --git a/.github/workflows/rolling-rhel-binary-build.yml b/.github/workflows/rolling-rhel-binary-build.yml
@@ -10,28 +10,6 @@ on:
 
 
 jobs:
-<<<<<<< HEAD
-  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_control
-      - name: Install dependencies
-        run: |
-          rosdep update
-          rosdep install -iyr --from-path src/ros2_control || true
-      - name: Build and test
-        run: |
-          source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash
-          colcon build --packages-skip rqt_controller_manager
-          colcon test --packages-skip rqt_controller_manager ros2controlcli
-          colcon test-result --verbose
-=======
   rhel_semi_binary_build:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-rhel-binary-build.yml@master
     strategy:
@@ -42,4 +20,3 @@ jobs:
       upstream_workspace: ros2_control.${{ matrix.ROS_DISTRO }}.repos
       ref_for_scheduled_build: master
       skip_packages: rqt_controller_manager
->>>>>>> 3a21841 ([CI] Reusable workflows from `ros2_control_ci` (#1383))