From ac5b4fc2e59d67db74609533412b0f8c5eaf63cc Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 23 Jan 2024 16:54:36 +0000 Subject: [PATCH 1/9] Fix RHEL workflows --- .../workflows/humble-rhel-binary-build.yml | 20 +++++++++---------- .github/workflows/iron-rhel-binary-build.yml | 16 +++++++++------ .../workflows/rolling-rhel-binary-build.yml | 16 +++++++++------ 3 files changed, 29 insertions(+), 23 deletions(-) diff --git a/.github/workflows/humble-rhel-binary-build.yml b/.github/workflows/humble-rhel-binary-build.yml index 9da6059892..cd9b85b2e1 100644 --- a/.github/workflows/humble-rhel-binary-build.yml +++ b/.github/workflows/humble-rhel-binary-build.yml @@ -1,19 +1,13 @@ -name: Humble RHEL Binary Build +name: RHEL Humble Binary Build on: workflow_dispatch: - branches: - - humble pull_request: branches: - humble - push: - branches: - - humble schedule: # Run every day to detect flakiness and broken dependencies - cron: '03 1 * * *' - jobs: humble_rhel_binary: name: Humble RHEL binary build @@ -25,9 +19,13 @@ jobs: - uses: actions/checkout@v4 with: path: src/ros2_controllers - - run: | + - name: Install dependencies + run: | rosdep update - rosdep install -iy --from-path src/ros2_controllers + rosdep install -iyr --from-path src/ros2_controllers || true + - name: Build and test + run: | source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash - colcon build - colcon test + colcon build --packages-skip rqt_joint_trajectory_controller + colcon test --packages-skip rqt_joint_trajectory_controller + colcon test-result --verbose diff --git a/.github/workflows/iron-rhel-binary-build.yml b/.github/workflows/iron-rhel-binary-build.yml index 5664d61768..f6205cf8d9 100644 --- a/.github/workflows/iron-rhel-binary-build.yml +++ b/.github/workflows/iron-rhel-binary-build.yml @@ -1,7 +1,7 @@ -name: Iron RHEL Binary Build +name: RHEL Iron Binary Build on: workflow_dispatch: - push: + pull_request: branches: - iron schedule: @@ -20,9 +20,13 @@ jobs: - uses: actions/checkout@v4 with: path: src/ros2_controllers - - run: | + - name: Install dependencies + run: | rosdep update - rosdep install -iy --from-path src/ros2_controllers + rosdep install -iyr --from-path src/ros2_controllers || true + - name: Build and test + run: | source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash - colcon build - colcon test + colcon build --packages-skip rqt_controller_manager + colcon test --packages-skip rqt_controller_manager ros2controlcli + colcon test-result --verbose diff --git a/.github/workflows/rolling-rhel-binary-build.yml b/.github/workflows/rolling-rhel-binary-build.yml index 04dc58775f..1bc7e5c904 100644 --- a/.github/workflows/rolling-rhel-binary-build.yml +++ b/.github/workflows/rolling-rhel-binary-build.yml @@ -1,7 +1,7 @@ -name: Rolling RHEL Binary Build +name: RHEL Rolling Binary Build on: workflow_dispatch: - push: + pull_request: branches: - master schedule: @@ -20,9 +20,13 @@ jobs: - uses: actions/checkout@v4 with: path: src/ros2_controllers - - run: | + - name: Install dependencies + run: | rosdep update - rosdep install -iy --from-path src/ros2_controllers + rosdep install -iyr --from-path src/ros2_controllers || true + - name: Build and test + run: | source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash - colcon build - colcon test + colcon build --packages-skip rqt_controller_manager + colcon test --packages-skip rqt_controller_manager ros2controlcli + colcon test-result --verbose From 55eb5574b420995dbb7b2fc7a202568e362d4750 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 23 Jan 2024 16:54:44 +0000 Subject: [PATCH 2/9] Add debian workflows --- .github/workflows/humble-debian-build.yml | 30 ++++++++++++++++++++++ .github/workflows/iron-debian-build.yml | 30 ++++++++++++++++++++++ .github/workflows/rolling-debian-build.yml | 30 ++++++++++++++++++++++ 3 files changed, 90 insertions(+) create mode 100644 .github/workflows/humble-debian-build.yml create mode 100644 .github/workflows/iron-debian-build.yml create mode 100644 .github/workflows/rolling-debian-build.yml diff --git a/.github/workflows/humble-debian-build.yml b/.github/workflows/humble-debian-build.yml new file mode 100644 index 0000000000..e8deb2caa5 --- /dev/null +++ b/.github/workflows/humble-debian-build.yml @@ -0,0 +1,30 @@ +name: Debian Humble Build +on: + workflow_dispatch: + pull_request: + branches: + - humble + schedule: + # Run every day to detect flakiness and broken dependencies + - cron: '03 1 * * *' + + +jobs: + 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_controllers + - name: Build and test + shell: bash + run: | + source /opt/ros2_ws/install/setup.bash + vcs import src < src/ros2_controllers/ros2_controllers.${{ env.ROS_DISTRO }}.repos + colcon build --packages-skip rqt_controller_manager rqt_joint_trajectory_controller + colcon test --packages-skip rqt_controller_manager rqt_joint_trajectory_controller control_msgs controller_manager_msgs + colcon test-result --verbose diff --git a/.github/workflows/iron-debian-build.yml b/.github/workflows/iron-debian-build.yml new file mode 100644 index 0000000000..09dbd051b2 --- /dev/null +++ b/.github/workflows/iron-debian-build.yml @@ -0,0 +1,30 @@ +name: Debian Iron Build +on: + workflow_dispatch: + pull_request: + branches: + - iron + schedule: + # Run every day to detect flakiness and broken dependencies + - cron: '03 1 * * *' + + +jobs: + 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_controllers + - name: Build and test + shell: bash + run: | + source /opt/ros2_ws/install/setup.bash + vcs import src < src/ros2_controllers/ros2_controllers.${{ env.ROS_DISTRO }}.repos + colcon build --packages-skip rqt_controller_manager rqt_joint_trajectory_controller + colcon test --packages-skip rqt_controller_manager rqt_joint_trajectory_controller control_msgs controller_manager_msgs + colcon test-result --verbose diff --git a/.github/workflows/rolling-debian-build.yml b/.github/workflows/rolling-debian-build.yml new file mode 100644 index 0000000000..b6d0a4193a --- /dev/null +++ b/.github/workflows/rolling-debian-build.yml @@ -0,0 +1,30 @@ +name: Debian Rolling Build +on: + workflow_dispatch: + pull_request: + branches: + - master + schedule: + # Run every day to detect flakiness and broken dependencies + - cron: '03 1 * * *' + + +jobs: + 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_controllers + - name: Build and test + shell: bash + run: | + source /opt/ros2_ws/install/setup.bash + vcs import src < src/ros2_controllers/ros2_controllers.${{ env.ROS_DISTRO }}.repos + colcon build --packages-skip rqt_controller_manager rqt_joint_trajectory_controller + colcon test --packages-skip rqt_controller_manager rqt_joint_trajectory_controller + colcon test-result --verbose From 6b158c869f0a511d611ec9769fe268d6654c16f2 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 23 Jan 2024 17:07:05 +0000 Subject: [PATCH 3/9] Build and test correct packages --- .github/workflows/humble-rhel-binary-build.yml | 4 ++-- .github/workflows/iron-rhel-binary-build.yml | 4 ++-- .github/workflows/rolling-rhel-binary-build.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/humble-rhel-binary-build.yml b/.github/workflows/humble-rhel-binary-build.yml index cd9b85b2e1..f5932a0a6e 100644 --- a/.github/workflows/humble-rhel-binary-build.yml +++ b/.github/workflows/humble-rhel-binary-build.yml @@ -26,6 +26,6 @@ jobs: - name: Build and test run: | source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash - colcon build --packages-skip rqt_joint_trajectory_controller - colcon test --packages-skip rqt_joint_trajectory_controller + colcon build --packages-skip rqt_joint_trajectory_controller rqt_joint_trajectory_controller + colcon test --packages-skip rqt_joint_trajectory_controller rqt_joint_trajectory_controller colcon test-result --verbose diff --git a/.github/workflows/iron-rhel-binary-build.yml b/.github/workflows/iron-rhel-binary-build.yml index f6205cf8d9..446b9088cd 100644 --- a/.github/workflows/iron-rhel-binary-build.yml +++ b/.github/workflows/iron-rhel-binary-build.yml @@ -27,6 +27,6 @@ jobs: - 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 build --packages-skip rqt_controller_manager rqt_joint_trajectory_controller + colcon test --packages-skip rqt_controller_manager rqt_joint_trajectory_controller colcon test-result --verbose diff --git a/.github/workflows/rolling-rhel-binary-build.yml b/.github/workflows/rolling-rhel-binary-build.yml index 1bc7e5c904..7f1aee6a7d 100644 --- a/.github/workflows/rolling-rhel-binary-build.yml +++ b/.github/workflows/rolling-rhel-binary-build.yml @@ -27,6 +27,6 @@ jobs: - 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 build --packages-skip rqt_controller_manager rqt_joint_trajectory_controller + colcon test --packages-skip rqt_controller_manager rqt_joint_trajectory_controller colcon test-result --verbose From aa9fb4762dab23f45b54cdb5255c454f2ad8797c Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 23 Jan 2024 17:09:35 +0000 Subject: [PATCH 4/9] Skip ros2controlcli for RHEL --- .github/workflows/humble-rhel-binary-build.yml | 2 +- .github/workflows/iron-rhel-binary-build.yml | 2 +- .github/workflows/rolling-rhel-binary-build.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/humble-rhel-binary-build.yml b/.github/workflows/humble-rhel-binary-build.yml index f5932a0a6e..c12a56db8e 100644 --- a/.github/workflows/humble-rhel-binary-build.yml +++ b/.github/workflows/humble-rhel-binary-build.yml @@ -27,5 +27,5 @@ jobs: run: | source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash colcon build --packages-skip rqt_joint_trajectory_controller rqt_joint_trajectory_controller - colcon test --packages-skip rqt_joint_trajectory_controller rqt_joint_trajectory_controller + colcon test --packages-skip rqt_joint_trajectory_controller rqt_joint_trajectory_controller ros2controlcli colcon test-result --verbose diff --git a/.github/workflows/iron-rhel-binary-build.yml b/.github/workflows/iron-rhel-binary-build.yml index 446b9088cd..b674805a9d 100644 --- a/.github/workflows/iron-rhel-binary-build.yml +++ b/.github/workflows/iron-rhel-binary-build.yml @@ -28,5 +28,5 @@ jobs: run: | source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash colcon build --packages-skip rqt_controller_manager rqt_joint_trajectory_controller - colcon test --packages-skip rqt_controller_manager rqt_joint_trajectory_controller + colcon test --packages-skip rqt_controller_manager rqt_joint_trajectory_controller ros2controlcli colcon test-result --verbose diff --git a/.github/workflows/rolling-rhel-binary-build.yml b/.github/workflows/rolling-rhel-binary-build.yml index 7f1aee6a7d..68a152c45f 100644 --- a/.github/workflows/rolling-rhel-binary-build.yml +++ b/.github/workflows/rolling-rhel-binary-build.yml @@ -28,5 +28,5 @@ jobs: run: | source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash colcon build --packages-skip rqt_controller_manager rqt_joint_trajectory_controller - colcon test --packages-skip rqt_controller_manager rqt_joint_trajectory_controller + colcon test --packages-skip rqt_controller_manager rqt_joint_trajectory_controller ros2controlcli colcon test-result --verbose From 787c2258cb66c13c421a40894a100b95c7ae6d31 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 23 Jan 2024 17:10:11 +0000 Subject: [PATCH 5/9] Fix typo --- .github/workflows/humble-rhel-binary-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/humble-rhel-binary-build.yml b/.github/workflows/humble-rhel-binary-build.yml index c12a56db8e..e6ed8d056d 100644 --- a/.github/workflows/humble-rhel-binary-build.yml +++ b/.github/workflows/humble-rhel-binary-build.yml @@ -26,6 +26,6 @@ jobs: - name: Build and test run: | source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash - colcon build --packages-skip rqt_joint_trajectory_controller rqt_joint_trajectory_controller - colcon test --packages-skip rqt_joint_trajectory_controller rqt_joint_trajectory_controller ros2controlcli + colcon build --packages-skip rqt_controller_manager rqt_joint_trajectory_controller + colcon test --packages-skip rqt_controller_manager rqt_joint_trajectory_controller ros2controlcli colcon test-result --verbose From 79725b2a4707109f645ec40134fa0fa2c2f6e95a Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 23 Jan 2024 19:26:58 +0000 Subject: [PATCH 6/9] Add generate_parameter_library and RSL from source --- .github/workflows/humble-rhel-binary-build.yml | 1 + .github/workflows/iron-rhel-binary-build.yml | 1 + .github/workflows/rolling-rhel-binary-build.yml | 1 + ros2_controllers-not-released.humble.repos | 13 ++++++++----- ros2_controllers-not-released.iron.repos | 13 ++++++++----- ros2_controllers-not-released.rolling.repos | 4 ++++ ros2_controllers.rolling.repos | 4 ++++ 7 files changed, 27 insertions(+), 10 deletions(-) diff --git a/.github/workflows/humble-rhel-binary-build.yml b/.github/workflows/humble-rhel-binary-build.yml index e6ed8d056d..595cad2b61 100644 --- a/.github/workflows/humble-rhel-binary-build.yml +++ b/.github/workflows/humble-rhel-binary-build.yml @@ -26,6 +26,7 @@ jobs: - name: Build and test run: | source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash + vcs import src < src/ros2_controllers/ros2_controllers-not-released.${{ env.ROS_DISTRO }}.repos colcon build --packages-skip rqt_controller_manager rqt_joint_trajectory_controller colcon test --packages-skip rqt_controller_manager rqt_joint_trajectory_controller ros2controlcli colcon test-result --verbose diff --git a/.github/workflows/iron-rhel-binary-build.yml b/.github/workflows/iron-rhel-binary-build.yml index b674805a9d..f0b269ae6d 100644 --- a/.github/workflows/iron-rhel-binary-build.yml +++ b/.github/workflows/iron-rhel-binary-build.yml @@ -27,6 +27,7 @@ jobs: - name: Build and test run: | source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash + vcs import src < src/ros2_controllers/ros2_controllers-not-released.${{ env.ROS_DISTRO }}.repos colcon build --packages-skip rqt_controller_manager rqt_joint_trajectory_controller colcon test --packages-skip rqt_controller_manager rqt_joint_trajectory_controller ros2controlcli colcon test-result --verbose diff --git a/.github/workflows/rolling-rhel-binary-build.yml b/.github/workflows/rolling-rhel-binary-build.yml index 68a152c45f..52675477a9 100644 --- a/.github/workflows/rolling-rhel-binary-build.yml +++ b/.github/workflows/rolling-rhel-binary-build.yml @@ -27,6 +27,7 @@ jobs: - name: Build and test run: | source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash + vcs import src < src/ros2_controllers/ros2_controllers-not-released.${{ env.ROS_DISTRO }}.repos colcon build --packages-skip rqt_controller_manager rqt_joint_trajectory_controller colcon test --packages-skip rqt_controller_manager rqt_joint_trajectory_controller ros2controlcli colcon test-result --verbose diff --git a/ros2_controllers-not-released.humble.repos b/ros2_controllers-not-released.humble.repos index 1b3910e7e7..408671d0af 100644 --- a/ros2_controllers-not-released.humble.repos +++ b/ros2_controllers-not-released.humble.repos @@ -1,6 +1,9 @@ repositories: - ## EXAMPLE DEPENDENCY -# : -# type: git -# url: git@github.com:/.git -# version: master + generate_parameter_library: + type: git + url: https://github.com/picknikrobotics/generate_parameter_library.git + version: main + RSL: + type: git + url: https://github.com/PickNikRobotics/RSL.git + version: main diff --git a/ros2_controllers-not-released.iron.repos b/ros2_controllers-not-released.iron.repos index 1b3910e7e7..408671d0af 100644 --- a/ros2_controllers-not-released.iron.repos +++ b/ros2_controllers-not-released.iron.repos @@ -1,6 +1,9 @@ repositories: - ## EXAMPLE DEPENDENCY -# : -# type: git -# url: git@github.com:/.git -# version: master + generate_parameter_library: + type: git + url: https://github.com/picknikrobotics/generate_parameter_library.git + version: main + RSL: + type: git + url: https://github.com/PickNikRobotics/RSL.git + version: main diff --git a/ros2_controllers-not-released.rolling.repos b/ros2_controllers-not-released.rolling.repos index 66352f4960..408671d0af 100644 --- a/ros2_controllers-not-released.rolling.repos +++ b/ros2_controllers-not-released.rolling.repos @@ -3,3 +3,7 @@ repositories: type: git url: https://github.com/picknikrobotics/generate_parameter_library.git version: main + RSL: + type: git + url: https://github.com/PickNikRobotics/RSL.git + version: main diff --git a/ros2_controllers.rolling.repos b/ros2_controllers.rolling.repos index 8c20eccc96..9b97953690 100644 --- a/ros2_controllers.rolling.repos +++ b/ros2_controllers.rolling.repos @@ -23,3 +23,7 @@ repositories: type: git url: https://github.com/picknikrobotics/generate_parameter_library.git version: main + RSL: + type: git + url: https://github.com/PickNikRobotics/RSL.git + version: main From 0ffbb48f3653749bf00b0cfccf768115f4584d97 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 23 Jan 2024 23:13:06 +0000 Subject: [PATCH 7/9] Revert "Add generate_parameter_library and RSL from source" This reverts commit 79725b2a4707109f645ec40134fa0fa2c2f6e95a. --- .github/workflows/humble-rhel-binary-build.yml | 1 - .github/workflows/iron-rhel-binary-build.yml | 1 - .github/workflows/rolling-rhel-binary-build.yml | 1 - ros2_controllers-not-released.humble.repos | 13 +++++-------- ros2_controllers-not-released.iron.repos | 13 +++++-------- ros2_controllers-not-released.rolling.repos | 4 ---- ros2_controllers.rolling.repos | 4 ---- 7 files changed, 10 insertions(+), 27 deletions(-) diff --git a/.github/workflows/humble-rhel-binary-build.yml b/.github/workflows/humble-rhel-binary-build.yml index 595cad2b61..e6ed8d056d 100644 --- a/.github/workflows/humble-rhel-binary-build.yml +++ b/.github/workflows/humble-rhel-binary-build.yml @@ -26,7 +26,6 @@ jobs: - name: Build and test run: | source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash - vcs import src < src/ros2_controllers/ros2_controllers-not-released.${{ env.ROS_DISTRO }}.repos colcon build --packages-skip rqt_controller_manager rqt_joint_trajectory_controller colcon test --packages-skip rqt_controller_manager rqt_joint_trajectory_controller ros2controlcli colcon test-result --verbose diff --git a/.github/workflows/iron-rhel-binary-build.yml b/.github/workflows/iron-rhel-binary-build.yml index f0b269ae6d..b674805a9d 100644 --- a/.github/workflows/iron-rhel-binary-build.yml +++ b/.github/workflows/iron-rhel-binary-build.yml @@ -27,7 +27,6 @@ jobs: - name: Build and test run: | source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash - vcs import src < src/ros2_controllers/ros2_controllers-not-released.${{ env.ROS_DISTRO }}.repos colcon build --packages-skip rqt_controller_manager rqt_joint_trajectory_controller colcon test --packages-skip rqt_controller_manager rqt_joint_trajectory_controller ros2controlcli colcon test-result --verbose diff --git a/.github/workflows/rolling-rhel-binary-build.yml b/.github/workflows/rolling-rhel-binary-build.yml index 52675477a9..68a152c45f 100644 --- a/.github/workflows/rolling-rhel-binary-build.yml +++ b/.github/workflows/rolling-rhel-binary-build.yml @@ -27,7 +27,6 @@ jobs: - name: Build and test run: | source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash - vcs import src < src/ros2_controllers/ros2_controllers-not-released.${{ env.ROS_DISTRO }}.repos colcon build --packages-skip rqt_controller_manager rqt_joint_trajectory_controller colcon test --packages-skip rqt_controller_manager rqt_joint_trajectory_controller ros2controlcli colcon test-result --verbose diff --git a/ros2_controllers-not-released.humble.repos b/ros2_controllers-not-released.humble.repos index 408671d0af..1b3910e7e7 100644 --- a/ros2_controllers-not-released.humble.repos +++ b/ros2_controllers-not-released.humble.repos @@ -1,9 +1,6 @@ repositories: - generate_parameter_library: - type: git - url: https://github.com/picknikrobotics/generate_parameter_library.git - version: main - RSL: - type: git - url: https://github.com/PickNikRobotics/RSL.git - version: main + ## EXAMPLE DEPENDENCY +# : +# type: git +# url: git@github.com:/.git +# version: master diff --git a/ros2_controllers-not-released.iron.repos b/ros2_controllers-not-released.iron.repos index 408671d0af..1b3910e7e7 100644 --- a/ros2_controllers-not-released.iron.repos +++ b/ros2_controllers-not-released.iron.repos @@ -1,9 +1,6 @@ repositories: - generate_parameter_library: - type: git - url: https://github.com/picknikrobotics/generate_parameter_library.git - version: main - RSL: - type: git - url: https://github.com/PickNikRobotics/RSL.git - version: main + ## EXAMPLE DEPENDENCY +# : +# type: git +# url: git@github.com:/.git +# version: master diff --git a/ros2_controllers-not-released.rolling.repos b/ros2_controllers-not-released.rolling.repos index 408671d0af..66352f4960 100644 --- a/ros2_controllers-not-released.rolling.repos +++ b/ros2_controllers-not-released.rolling.repos @@ -3,7 +3,3 @@ repositories: type: git url: https://github.com/picknikrobotics/generate_parameter_library.git version: main - RSL: - type: git - url: https://github.com/PickNikRobotics/RSL.git - version: main diff --git a/ros2_controllers.rolling.repos b/ros2_controllers.rolling.repos index 9b97953690..8c20eccc96 100644 --- a/ros2_controllers.rolling.repos +++ b/ros2_controllers.rolling.repos @@ -23,7 +23,3 @@ repositories: type: git url: https://github.com/picknikrobotics/generate_parameter_library.git version: main - RSL: - type: git - url: https://github.com/PickNikRobotics/RSL.git - version: main From d6e7569c96d0eb42b43ca5078aa59a2ff6c3b1d5 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 23 Jan 2024 23:22:23 +0000 Subject: [PATCH 8/9] Source underlay workspace on RHEL9 --- .github/workflows/iron-rhel-binary-build.yml | 2 ++ .github/workflows/rolling-rhel-binary-build.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/iron-rhel-binary-build.yml b/.github/workflows/iron-rhel-binary-build.yml index b674805a9d..ce60f58f3a 100644 --- a/.github/workflows/iron-rhel-binary-build.yml +++ b/.github/workflows/iron-rhel-binary-build.yml @@ -25,8 +25,10 @@ jobs: rosdep update rosdep install -iyr --from-path src/ros2_controllers || true - name: Build and test + # source also underlay workspace with generate_parameter_library on rhel9 run: | source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash + source /opt/ros2_ws/install/setup.bash colcon build --packages-skip rqt_controller_manager rqt_joint_trajectory_controller colcon test --packages-skip rqt_controller_manager rqt_joint_trajectory_controller ros2controlcli colcon test-result --verbose diff --git a/.github/workflows/rolling-rhel-binary-build.yml b/.github/workflows/rolling-rhel-binary-build.yml index 68a152c45f..38d12ab960 100644 --- a/.github/workflows/rolling-rhel-binary-build.yml +++ b/.github/workflows/rolling-rhel-binary-build.yml @@ -25,8 +25,10 @@ jobs: rosdep update rosdep install -iyr --from-path src/ros2_controllers || true - name: Build and test + # source also underlay workspace with generate_parameter_library on rhel9 run: | source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash + source /opt/ros2_ws/install/setup.bash colcon build --packages-skip rqt_controller_manager rqt_joint_trajectory_controller colcon test --packages-skip rqt_controller_manager rqt_joint_trajectory_controller ros2controlcli colcon test-result --verbose From 2301d986684dab306cd3252c79fea1718ee2d8ae Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 23 Jan 2024 23:22:36 +0000 Subject: [PATCH 9/9] Cleanup RHEL jobs --- .github/workflows/humble-rhel-binary-build.yml | 4 ++-- .github/workflows/iron-rhel-binary-build.yml | 4 ++-- .github/workflows/rolling-rhel-binary-build.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/humble-rhel-binary-build.yml b/.github/workflows/humble-rhel-binary-build.yml index e6ed8d056d..cd9b85b2e1 100644 --- a/.github/workflows/humble-rhel-binary-build.yml +++ b/.github/workflows/humble-rhel-binary-build.yml @@ -26,6 +26,6 @@ jobs: - name: Build and test run: | source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash - colcon build --packages-skip rqt_controller_manager rqt_joint_trajectory_controller - colcon test --packages-skip rqt_controller_manager rqt_joint_trajectory_controller ros2controlcli + colcon build --packages-skip rqt_joint_trajectory_controller + colcon test --packages-skip rqt_joint_trajectory_controller colcon test-result --verbose diff --git a/.github/workflows/iron-rhel-binary-build.yml b/.github/workflows/iron-rhel-binary-build.yml index ce60f58f3a..0eb28b9673 100644 --- a/.github/workflows/iron-rhel-binary-build.yml +++ b/.github/workflows/iron-rhel-binary-build.yml @@ -29,6 +29,6 @@ jobs: run: | source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash source /opt/ros2_ws/install/setup.bash - colcon build --packages-skip rqt_controller_manager rqt_joint_trajectory_controller - colcon test --packages-skip rqt_controller_manager rqt_joint_trajectory_controller ros2controlcli + colcon build --packages-skip rqt_joint_trajectory_controller + colcon test --packages-skip rqt_joint_trajectory_controller colcon test-result --verbose diff --git a/.github/workflows/rolling-rhel-binary-build.yml b/.github/workflows/rolling-rhel-binary-build.yml index 38d12ab960..dece43b673 100644 --- a/.github/workflows/rolling-rhel-binary-build.yml +++ b/.github/workflows/rolling-rhel-binary-build.yml @@ -29,6 +29,6 @@ jobs: run: | source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash source /opt/ros2_ws/install/setup.bash - colcon build --packages-skip rqt_controller_manager rqt_joint_trajectory_controller - colcon test --packages-skip rqt_controller_manager rqt_joint_trajectory_controller ros2controlcli + colcon build --packages-skip rqt_joint_trajectory_controller + colcon test --packages-skip rqt_joint_trajectory_controller colcon test-result --verbose