From 8e74228e933ccb8fe8a951fbe124532a43cb03ea Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Thu, 15 Feb 2024 12:43:48 +0000 Subject: [PATCH] Fix merge conflicts --- .github/workflows/humble-debian-build.yml | 23 +------------------ .../workflows/humble-rhel-binary-build.yml | 23 ------------------- .github/workflows/iron-debian-build.yml | 23 +------------------ .github/workflows/iron-rhel-binary-build.yml | 23 ------------------- .github/workflows/rolling-debian-build.yml | 21 ----------------- .../workflows/rolling-rhel-binary-build.yml | 23 ------------------- 6 files changed, 2 insertions(+), 134 deletions(-) diff --git a/.github/workflows/humble-debian-build.yml b/.github/workflows/humble-debian-build.yml index fc0f93aa7a..5f6badaa19 100644 --- 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 index 5e30a686e8..c541b00636 100644 --- 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 index 5e175936b5..393795965c 100644 --- 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 index 8817ae575a..a58094416f 100644 --- 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 index 6afdc2c843..c175f41e5b 100644 --- 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 index da952d4b4d..3f285a240b 100644 --- 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))