diff --git a/.github/workflows/humble-abi-compatibility.yml b/.github/workflows/humble-abi-compatibility.yml deleted file mode 100644 index 2240ef7b46..0000000000 --- a/.github/workflows/humble-abi-compatibility.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: Humble - ABI Compatibility Check -on: - workflow_dispatch: - pull_request: - branches: - - humble - paths: - - '**.hpp' - - '**.h' - - '**.cpp' - - '**.py' - - '**.yaml' - - '.github/workflows/humble-abi-compatibility.yml' - - '**/package.xml' - - '**/CMakeLists.txt' - - 'ros2_control-not-released.humble.repos' - -concurrency: - # cancel previous runs of the same workflow, except for pushes on given branches - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }} - -jobs: - abi_check: - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-abi-check.yml@master - with: - ros_distro: humble diff --git a/.github/workflows/humble-binary-build.yml b/.github/workflows/humble-binary-build.yml deleted file mode 100644 index 4437819647..0000000000 --- a/.github/workflows/humble-binary-build.yml +++ /dev/null @@ -1,42 +0,0 @@ -name: Humble Binary Build -# author: Denis Štogl -# description: 'Build & test all dependencies from released (binary) packages.' - -on: - workflow_dispatch: - pull_request: &event - branches: - - humble - paths: - - '**.hpp' - - '**.h' - - '**.cpp' - - '**.py' - - '**.yaml' - - '.github/workflows/humble-binary-build.yml' - - '**/package.xml' - - '**/CMakeLists.txt' - - 'ros2_control-not-released.humble.repos' - push: *event - schedule: - # Run every morning to detect flakiness and broken dependencies - - cron: '03 1 * * MON-FRI' - -concurrency: - # cancel previous runs of the same workflow, except for pushes on given branches - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }} - -jobs: - binary: - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master - strategy: - fail-fast: false - matrix: - ROS_DISTRO: [humble] - ROS_REPO: [main, testing] - with: - ros_distro: ${{ matrix.ROS_DISTRO }} - ros_repo: ${{ matrix.ROS_REPO }} - upstream_workspace: ros2_control-not-released.${{ matrix.ROS_DISTRO }}.repos - ref_for_scheduled_build: humble diff --git a/.github/workflows/humble-check-docs.yml b/.github/workflows/humble-check-docs.yml deleted file mode 100644 index 33483ffa55..0000000000 --- a/.github/workflows/humble-check-docs.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: Humble Check Docs - -on: - workflow_dispatch: - pull_request: - branches: - - humble - paths: - - '**.rst' - - '**.md' - - '**.jpg' - - '**.jpeg' - - '**.png' - - '**.svg' - - '**.yml' - - '**.yaml' - - '!.github/**' # exclude yaml files in .github directory - - '.github/workflows/humble-check-docs.yml' - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -jobs: - check-docs: - name: Check Docs - uses: ros-controls/control.ros.org/.github/workflows/reusable-sphinx-check-single-version.yml@humble - with: - ROS2_CONTROL_PR: ${{ github.ref }} diff --git a/.github/workflows/humble-coverage-build.yml b/.github/workflows/humble-coverage-build.yml deleted file mode 100644 index 68f1a48106..0000000000 --- a/.github/workflows/humble-coverage-build.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: Coverage Build - Humble -on: - workflow_dispatch: - pull_request: &event - branches: - - humble - paths: - - '**.hpp' - - '**.h' - - '**.cpp' - - '**.py' - - '**.yaml' - - '.github/workflows/humble-coverage-build.yml' - - '**/package.xml' - - '**/CMakeLists.txt' - - 'ros2_control.humble.repos' - - 'codecov.yml' - push: *event - -concurrency: - # cancel previous runs of the same workflow, except for pushes on given branches - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }} - -jobs: - coverage_humble: - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@master - secrets: inherit - with: - ros_distro: humble diff --git a/.github/workflows/humble-debian-build.yml b/.github/workflows/humble-debian-build.yml deleted file mode 100644 index 9b9414014b..0000000000 --- a/.github/workflows/humble-debian-build.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: Humble - Debian Semi-Binary Build -on: - workflow_dispatch: - pull_request: - branches: - - humble - paths: - - '**.hpp' - - '**.h' - - '**.cpp' - - '**.py' - - '**.yaml' - - '.github/workflows/humble-debian-build.yml' - - '**/package.xml' - - '**/CMakeLists.txt' - - 'ros2_control.humble.repos' - schedule: - # Run every day to detect flakiness and broken dependencies - - cron: '03 1 * * MON-FRI' - -concurrency: - # cancel previous runs of the same workflow, except for pushes on given branches - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }} - -jobs: - debian_semi_binary_build: - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-debian-build.yml@master - with: - ros_distro: humble - upstream_workspace: ros2_control.humble.repos - ref_for_scheduled_build: humble - skip_packages: rqt_controller_manager - skip_packages_test: controller_manager_msgs control_msgs diff --git a/.github/workflows/humble-pre-release.yml b/.github/workflows/humble-pre-release.yml deleted file mode 100644 index a8a4dab1a0..0000000000 --- a/.github/workflows/humble-pre-release.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: Humble - pre-release -# author: Christoph Froehlich - -on: - workflow_dispatch: - inputs: - downstream_depth: - description: 'The depth of the depends-on tree to be included in the overlay workspace (-1 implies unlimited, default: 0)' - required: false - default: 0 - type: number - pull_request: - branches: - - humble - types: - - opened # default - - reopened # default - - synchronize # default - - labeled # also if a label changes - -jobs: - default: - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-prerelease.yml@master - with: - ros_distro: humble - # downstream_depth is not set on pull_request event - prerelease_downstream_depth: ${{ github.event_name == 'pull_request' && '0' || inputs.downstream_depth }} diff --git a/.github/workflows/humble-rhel-binary-build.yml b/.github/workflows/humble-rhel-binary-build.yml deleted file mode 100644 index 10b97eb5f2..0000000000 --- a/.github/workflows/humble-rhel-binary-build.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: Humble - RHEL Semi-Binary Build -on: - workflow_dispatch: - pull_request: - branches: - - humble - paths: - - '**.hpp' - - '**.h' - - '**.cpp' - - '**.py' - - '**.yaml' - - '.github/workflows/humble-rhel-binary-build.yml' - - '**/package.xml' - - '**/CMakeLists.txt' - - 'ros2_control.humble.repos' - schedule: - # Run every day to detect flakiness and broken dependencies - - cron: '03 1 * * MON-FRI' - -concurrency: - # cancel previous runs of the same workflow, except for pushes on given branches - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }} - -jobs: - rhel_semi_binary_build: - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-rhel-binary-build.yml@master - strategy: - fail-fast: false - matrix: - ROS_DISTRO: [humble] - with: - ros_distro: ${{ matrix.ROS_DISTRO }} - upstream_workspace: ros2_control.${{ matrix.ROS_DISTRO }}.repos - ref_for_scheduled_build: humble - skip_packages: rqt_controller_manager diff --git a/.github/workflows/humble-semi-binary-build.yml b/.github/workflows/humble-semi-binary-build.yml deleted file mode 100644 index d9e5c1f5ad..0000000000 --- a/.github/workflows/humble-semi-binary-build.yml +++ /dev/null @@ -1,52 +0,0 @@ -name: Humble Semi-Binary Build -# author: Denis Štogl -# description: 'Build & test all ros2_control dependencies from source.' - -on: - workflow_dispatch: - pull_request: &event - branches: - - humble - paths: - - '**.hpp' - - '**.h' - - '**.cpp' - - '**.py' - - '**.yaml' - - '.github/workflows/humble-semi-binary-build.yml' - - '**/package.xml' - - '**/CMakeLists.txt' - - 'ros2_control.humble.repos' - push: *event - schedule: - # Run every morning to detect flakiness and broken dependencies - - cron: '03 1 * * MON-FRI' - -concurrency: - # cancel previous runs of the same workflow, except for pushes on given branches - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }} - -jobs: - semi-binary: - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master - strategy: - fail-fast: false - matrix: - ROS_DISTRO: [humble] - with: - ros_distro: ${{ matrix.ROS_DISTRO }} - ros_repo: testing - upstream_workspace: ros2_control.${{ matrix.ROS_DISTRO }}.repos - ref_for_scheduled_build: humble - semi-binary-clang: - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master - with: - ros_distro: humble - ros_repo: testing - upstream_workspace: ros2_control.humble.repos - ref_for_scheduled_build: humble - additional_debs: clang - c_compiler: clang - cxx_compiler: clang++ - not_test_build: true diff --git a/.github/workflows/humble-semi-binary-downstream-build.yml b/.github/workflows/humble-semi-binary-downstream-build.yml deleted file mode 100644 index a1bc86a853..0000000000 --- a/.github/workflows/humble-semi-binary-downstream-build.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: Humble Downstream Build -# description: 'Build & test downstream packages from source.' -# author: Christoph Froehlich - -on: - workflow_dispatch: - pull_request: - branches: - - humble - paths: - - '**.hpp' - - '**.h' - - '**.cpp' - - '**.py' - - '**.yaml' - - '.github/workflows/humble-semi-binary-downstream-build.yml' - - '**/package.xml' - - '**/CMakeLists.txt' - - 'ros_controls.humble.repos' - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -jobs: - build-downstream: - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master - with: - ros_distro: humble - ros_repo: testing - ref_for_scheduled_build: humble - upstream_workspace: ros2_control.humble.repos - # we don't test target_workspace, we just build it - not_test_build: true - # we test the downstream packages, which are part of our organization - downstream_workspace: ros_controls.humble.repos - not_test_downstream: false diff --git a/.github/workflows/humble-source-build.yml b/.github/workflows/humble-source-build.yml index 8773e4c265..ee629f630a 100644 --- a/.github/workflows/humble-source-build.yml +++ b/.github/workflows/humble-source-build.yml @@ -17,8 +17,8 @@ on: pull_request: branches: - humble - paths: - - .github/workflows/humble-source-build.yml + # paths: + # - .github/workflows/humble-source-build.yml schedule: # Run every day to detect flakiness and broken dependencies - cron: '03 3 * * MON-FRI' diff --git a/controller_manager/CMakeLists.txt b/controller_manager/CMakeLists.txt index 100ccc0710..0a777f8f9f 100644 --- a/controller_manager/CMakeLists.txt +++ b/controller_manager/CMakeLists.txt @@ -136,7 +136,7 @@ if(BUILD_TESTING) ament_target_dependencies(test_controller_manager_srvs controller_manager_msgs ) - set_tests_properties(test_controller_manager_srvs PROPERTIES TIMEOUT 120) + set_tests_properties(test_controller_manager_srvs PROPERTIES TIMEOUT 240) ament_add_gmock(test_controller_manager_urdf_passing test/test_controller_manager_urdf_passing.cpp )