From ff962a2a00fc93430e7b2425c75b216e92fb707a Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Wed, 14 Aug 2024 11:42:19 +0000 Subject: [PATCH 01/11] Test coveragepy --- .github/workflows/rolling-coverage-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rolling-coverage-build.yml b/.github/workflows/rolling-coverage-build.yml index 45b10876e7..5c2f3d3d4c 100644 --- a/.github/workflows/rolling-coverage-build.yml +++ b/.github/workflows/rolling-coverage-build.yml @@ -30,7 +30,7 @@ on: jobs: coverage_rolling: - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@master + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@coveragepy secrets: inherit with: ros_distro: rolling From e5d51eae9ffda6f6ae8b21a0b932c09a64ccce38 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Wed, 14 Aug 2024 11:43:02 +0000 Subject: [PATCH 02/11] Use coveragepy within tests --- controller_manager/test/test_spawner_unspawner.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/controller_manager/test/test_spawner_unspawner.cpp b/controller_manager/test/test_spawner_unspawner.cpp index 83080ee0fa..48ad991a46 100644 --- a/controller_manager/test/test_spawner_unspawner.cpp +++ b/controller_manager/test/test_spawner_unspawner.cpp @@ -68,13 +68,13 @@ class TestLoadController : public ControllerManagerFixtureset_parameter(rclcpp::Parameter("ctrl_3.type", test_controller::TEST_CONTROLLER_CLASS_NAME)); std::stringstream ss; ss << "timeout --signal=INT 5 " - << "ros2 run controller_manager spawner ctrl_3 -c test_controller_manager" - << " --unload-on-kill"; + << "coverage run controller_manager.spawner " + << "ctrl_3 -c test_controller_manager --unload-on-kill"; EXPECT_NE(std::system(ss.str().c_str()), 0) << "timeout should have killed spawner and returned non 0 code"; From ca04b8c457301843df9902e734dbbe507e03b247 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Wed, 14 Aug 2024 11:43:27 +0000 Subject: [PATCH 03/11] Use entry point instead --- controller_manager/test/test_spawner_unspawner.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/controller_manager/test/test_spawner_unspawner.cpp b/controller_manager/test/test_spawner_unspawner.cpp index 48ad991a46..714d8e4db4 100644 --- a/controller_manager/test/test_spawner_unspawner.cpp +++ b/controller_manager/test/test_spawner_unspawner.cpp @@ -68,13 +68,15 @@ class TestLoadController : public ControllerManagerFixtureset_parameter(rclcpp::Parameter("ctrl_3.type", test_controller::TEST_CONTROLLER_CLASS_NAME)); std::stringstream ss; ss << "timeout --signal=INT 5 " - << "coverage run controller_manager.spawner " + << "python3 -m $(ros2 pkg prefix controller_manager)/lib/controller_manager/spawner " << "ctrl_3 -c test_controller_manager --unload-on-kill"; EXPECT_NE(std::system(ss.str().c_str()), 0) From 26c3156e8412c29d13090f0c7c56b07d01d99301 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Wed, 14 Aug 2024 11:43:27 +0000 Subject: [PATCH 04/11] Temporarily delete wfs --- .github/workflows/jazzy-abi-compatibility.yml | 27 ----------- .github/workflows/jazzy-binary-build.yml | 47 ------------------- .github/workflows/jazzy-check-docs.yml | 18 ------- .github/workflows/jazzy-coverage-build.yml | 35 -------------- .github/workflows/jazzy-debian-build.yml | 32 ------------- .github/workflows/jazzy-pre-commit.yml | 13 ----- .github/workflows/jazzy-rhel-binary-build.yml | 31 ------------ .github/workflows/jazzy-semi-binary-build.yml | 47 ------------------- .github/workflows/jazzy-source-build.yml | 27 ----------- .../workflows/rolling-abi-compatibility.yml | 27 ----------- .github/workflows/rolling-binary-build.yml | 47 ------------------- .github/workflows/rolling-check-docs.yml | 19 -------- .github/workflows/rolling-debian-build.yml | 32 ------------- .../workflows/rolling-rhel-binary-build.yml | 31 ------------ .../workflows/rolling-semi-binary-build.yml | 47 ------------------- .github/workflows/rolling-source-build.yml | 27 ----------- 16 files changed, 507 deletions(-) delete mode 100644 .github/workflows/jazzy-abi-compatibility.yml delete mode 100644 .github/workflows/jazzy-binary-build.yml delete mode 100644 .github/workflows/jazzy-check-docs.yml delete mode 100644 .github/workflows/jazzy-coverage-build.yml delete mode 100644 .github/workflows/jazzy-debian-build.yml delete mode 100644 .github/workflows/jazzy-pre-commit.yml delete mode 100644 .github/workflows/jazzy-rhel-binary-build.yml delete mode 100644 .github/workflows/jazzy-semi-binary-build.yml delete mode 100644 .github/workflows/jazzy-source-build.yml delete mode 100644 .github/workflows/rolling-abi-compatibility.yml delete mode 100644 .github/workflows/rolling-binary-build.yml delete mode 100644 .github/workflows/rolling-check-docs.yml delete mode 100644 .github/workflows/rolling-debian-build.yml delete mode 100644 .github/workflows/rolling-rhel-binary-build.yml delete mode 100644 .github/workflows/rolling-semi-binary-build.yml delete mode 100644 .github/workflows/rolling-source-build.yml diff --git a/.github/workflows/jazzy-abi-compatibility.yml b/.github/workflows/jazzy-abi-compatibility.yml deleted file mode 100644 index 367b3736fb..0000000000 --- a/.github/workflows/jazzy-abi-compatibility.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: Jazzy - ABI Compatibility Check -on: - workflow_dispatch: - pull_request: - branches: - - master - paths: - - '**.hpp' - - '**.h' - - '**.cpp' - - '**.py' - - '.github/workflows/jazzy-abi-compatibility.yml' - - '**/package.xml' - - '**/CMakeLists.txt' - - 'ros2_control-not-released.jazzy.repos' - -jobs: - abi_check: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: ros-industrial/industrial_ci@master - env: - ROS_DISTRO: jazzy - ROS_REPO: testing - ABICHECK_URL: github:${{ github.repository }}#${{ github.base_ref }} - NOT_TEST_BUILD: true diff --git a/.github/workflows/jazzy-binary-build.yml b/.github/workflows/jazzy-binary-build.yml deleted file mode 100644 index 5be853ebfc..0000000000 --- a/.github/workflows/jazzy-binary-build.yml +++ /dev/null @@ -1,47 +0,0 @@ -name: Jazzy Binary Build -# author: Denis Štogl -# description: 'Build & test all dependencies from released (binary) packages.' - -on: - workflow_dispatch: - pull_request: - branches: - - master - paths: - - '**.hpp' - - '**.h' - - '**.cpp' - - '**.py' - - '.github/workflows/jazzy-binary-build.yml' - - '**/package.xml' - - '**/CMakeLists.txt' - - 'ros2_control-not-released.jazzy.repos' - push: - branches: - - master - paths: - - '**.hpp' - - '**.h' - - '**.cpp' - - '**.py' - - '.github/workflows/jazzy-binary-build.yml' - - '**/package.xml' - - '**/CMakeLists.txt' - - 'ros2_control-not-released.jazzy.repos' - schedule: - # Run every morning to detect flakiness and broken dependencies - - cron: '03 1 * * *' - -jobs: - binary: - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master - strategy: - fail-fast: false - matrix: - ROS_DISTRO: [jazzy] - 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: master diff --git a/.github/workflows/jazzy-check-docs.yml b/.github/workflows/jazzy-check-docs.yml deleted file mode 100644 index cbdf6c30bd..0000000000 --- a/.github/workflows/jazzy-check-docs.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Jazzy Check Docs - -on: - workflow_dispatch: - pull_request: - branches: - - master - paths: - - '**.rst' - - '**.md' - - '**.yaml' - -jobs: - check-docs: - name: Check Docs - uses: ros-controls/control.ros.org/.github/workflows/reusable-sphinx-check-single-version.yml@jazzy - with: - ROS2_CONTROL_PR: ${{ github.ref }} diff --git a/.github/workflows/jazzy-coverage-build.yml b/.github/workflows/jazzy-coverage-build.yml deleted file mode 100644 index aa345d1e80..0000000000 --- a/.github/workflows/jazzy-coverage-build.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: Coverage Build - Jazzy -on: - workflow_dispatch: - # TODO(anyone) activate when branched for Jazzy - # push: - # branches: - # - master - # paths: - # - '**.hpp' - # - '**.h' - # - '**.cpp' - # - '.github/workflows/jazzy-coverage-build.yml' - # - '**/package.xml' - # - '**/CMakeLists.txt' - # - 'ros2_control.jazzy.repos' - # - 'codecov.yml' - # pull_request: - # branches: - # - master - # paths: - # - '**.hpp' - # - '**.h' - # - '**.cpp' - # - '.github/workflows/jazzy-coverage-build.yml' - # - '**/package.xml' - # - '**/CMakeLists.txt' - # - 'ros2_control.jazzy.repos' - # - 'codecov.yml' - -jobs: - coverage_jazzy: - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@master - secrets: inherit - with: - ros_distro: jazzy diff --git a/.github/workflows/jazzy-debian-build.yml b/.github/workflows/jazzy-debian-build.yml deleted file mode 100644 index 4ec6a29fff..0000000000 --- a/.github/workflows/jazzy-debian-build.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: Debian Jazzy Source Build -on: - workflow_dispatch: - pull_request: - branches: - - master - paths: - - '**.hpp' - - '**.h' - - '**.cpp' - - '**.py' - - '.github/workflows/jazzy-debian-build.yml' - - '**/package.xml' - - '**/CMakeLists.txt' - - 'ros2_control.jazzy.repos' - schedule: - # Run every day to detect flakiness and broken dependencies - - cron: '03 1 * * *' - - -jobs: - debian_source_build: - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-debian-build.yml@master - strategy: - fail-fast: false - matrix: - ROS_DISTRO: [jazzy] - with: - ros_distro: ${{ matrix.ROS_DISTRO }} - upstream_workspace: ros2_control.${{ matrix.ROS_DISTRO }}.repos - ref_for_scheduled_build: master - skip_packages: rqt_controller_manager diff --git a/.github/workflows/jazzy-pre-commit.yml b/.github/workflows/jazzy-pre-commit.yml deleted file mode 100644 index d9ec610bbc..0000000000 --- a/.github/workflows/jazzy-pre-commit.yml +++ /dev/null @@ -1,13 +0,0 @@ -name: Pre-Commit - Jazzy - -on: - workflow_dispatch: - pull_request: - branches: - - master - -jobs: - pre-commit: - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master - with: - ros_distro: jazzy diff --git a/.github/workflows/jazzy-rhel-binary-build.yml b/.github/workflows/jazzy-rhel-binary-build.yml deleted file mode 100644 index 0dcc912dab..0000000000 --- a/.github/workflows/jazzy-rhel-binary-build.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: RHEL Jazzy Semi-Binary Build -on: - workflow_dispatch: - pull_request: - branches: - - master - paths: - - '**.hpp' - - '**.h' - - '**.cpp' - - '**.py' - - '.github/workflows/jazzy-rhel-binary-build.yml' - - '**/package.xml' - - '**/CMakeLists.txt' - - 'ros2_control.jazzy.repos' - schedule: - # Run every day to detect flakiness and broken dependencies - - cron: '03 1 * * *' - -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: [jazzy] - with: - ros_distro: ${{ matrix.ROS_DISTRO }} - upstream_workspace: ros2_control.${{ matrix.ROS_DISTRO }}.repos - ref_for_scheduled_build: master - skip_packages: rqt_controller_manager diff --git a/.github/workflows/jazzy-semi-binary-build.yml b/.github/workflows/jazzy-semi-binary-build.yml deleted file mode 100644 index 9634732cf9..0000000000 --- a/.github/workflows/jazzy-semi-binary-build.yml +++ /dev/null @@ -1,47 +0,0 @@ -name: Jazzy Semi-Binary Build -# author: Denis Štogl -# description: 'Build & test all dependencies from released (binary) packages.' - -on: - workflow_dispatch: - pull_request: - branches: - - master - paths: - - '**.hpp' - - '**.h' - - '**.cpp' - - '**.py' - - '.github/workflows/jazzy-semi-binary-build.yml' - - '**/package.xml' - - '**/CMakeLists.txt' - - 'ros2_control.jazzy.repos' - push: - branches: - - master - paths: - - '**.hpp' - - '**.h' - - '**.cpp' - - '**.py' - - '.github/workflows/jazzy-semi-binary-build.yml' - - '**/package.xml' - - '**/CMakeLists.txt' - - 'ros2_control.jazzy.repos' - schedule: - # Run every morning to detect flakiness and broken dependencies - - cron: '03 1 * * *' - -jobs: - binary: - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master - strategy: - fail-fast: false - matrix: - ROS_DISTRO: [jazzy] - ROS_REPO: [main, testing] - with: - ros_distro: ${{ matrix.ROS_DISTRO }} - ros_repo: ${{ matrix.ROS_REPO }} - upstream_workspace: ros2_control.${{ matrix.ROS_DISTRO }}.repos - ref_for_scheduled_build: master diff --git a/.github/workflows/jazzy-source-build.yml b/.github/workflows/jazzy-source-build.yml deleted file mode 100644 index 65066a4bf2..0000000000 --- a/.github/workflows/jazzy-source-build.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: Jazzy Source Build -on: - workflow_dispatch: - push: - branches: - - master - paths: - - '**.hpp' - - '**.h' - - '**.cpp' - - '**.py' - - '.github/workflows/jazzy-source-build.yml' - - '**/package.xml' - - '**/CMakeLists.txt' - - 'ros2_control.jazzy.repos' - schedule: - # Run every day to detect flakiness and broken dependencies - - cron: '03 3 * * *' - -jobs: - source: - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-source-build.yml@master - with: - ros_distro: jazzy - ref: master - ros2_repo_branch: master - container: ubuntu:24.04 diff --git a/.github/workflows/rolling-abi-compatibility.yml b/.github/workflows/rolling-abi-compatibility.yml deleted file mode 100644 index b7828390fb..0000000000 --- a/.github/workflows/rolling-abi-compatibility.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: Rolling - ABI Compatibility Check -on: - workflow_dispatch: - pull_request: - branches: - - master - paths: - - '**.hpp' - - '**.h' - - '**.cpp' - - '**.py' - - '.github/workflows/rolling-abi-compatibility.yml' - - '**/package.xml' - - '**/CMakeLists.txt' - - 'ros2_control-not-released.rolling.repos' - -jobs: - abi_check: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: ros-industrial/industrial_ci@master - env: - ROS_DISTRO: rolling - ROS_REPO: testing - ABICHECK_URL: github:${{ github.repository }}#${{ github.base_ref }} - NOT_TEST_BUILD: true diff --git a/.github/workflows/rolling-binary-build.yml b/.github/workflows/rolling-binary-build.yml deleted file mode 100644 index 24a28f16ae..0000000000 --- a/.github/workflows/rolling-binary-build.yml +++ /dev/null @@ -1,47 +0,0 @@ -name: Rolling Binary Build -# author: Denis Štogl -# description: 'Build & test all dependencies from released (binary) packages.' - -on: - workflow_dispatch: - pull_request: - branches: - - master - paths: - - '**.hpp' - - '**.h' - - '**.cpp' - - '**.py' - - '.github/workflows/rolling-binary-build.yml' - - '**/package.xml' - - '**/CMakeLists.txt' - - 'ros2_control-not-released.rolling.repos' - push: - branches: - - master - paths: - - '**.hpp' - - '**.h' - - '**.cpp' - - '**.py' - - '.github/workflows/rolling-binary-build.yml' - - '**/package.xml' - - '**/CMakeLists.txt' - - 'ros2_control-not-released.rolling.repos' - schedule: - # Run every morning to detect flakiness and broken dependencies - - cron: '03 1 * * *' - -jobs: - binary: - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master - strategy: - fail-fast: false - matrix: - ROS_DISTRO: [rolling] - 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: master diff --git a/.github/workflows/rolling-check-docs.yml b/.github/workflows/rolling-check-docs.yml deleted file mode 100644 index bd83c0caca..0000000000 --- a/.github/workflows/rolling-check-docs.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: Rolling Check Docs - -on: - workflow_dispatch: - pull_request: - branches: - - master - paths: - - '**.rst' - - '**.md' - - '**.yaml' - - '.github/workflows/rolling-check-docs.yml' - -jobs: - check-docs: - name: Check Docs - uses: ros-controls/control.ros.org/.github/workflows/reusable-sphinx-check-single-version.yml@rolling - with: - ROS2_CONTROL_PR: ${{ github.ref }} diff --git a/.github/workflows/rolling-debian-build.yml b/.github/workflows/rolling-debian-build.yml deleted file mode 100644 index 00d4ad844b..0000000000 --- a/.github/workflows/rolling-debian-build.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: Debian Rolling Source Build -on: - workflow_dispatch: - pull_request: - branches: - - master - paths: - - '**.hpp' - - '**.h' - - '**.cpp' - - '**.py' - - '.github/workflows/rolling-debian-build.yml' - - '**/package.xml' - - '**/CMakeLists.txt' - - 'ros2_control.rolling.repos' - schedule: - # Run every day to detect flakiness and broken dependencies - - cron: '03 1 * * *' - - -jobs: - debian_source_build: - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-debian-build.yml@master - strategy: - fail-fast: false - matrix: - ROS_DISTRO: [rolling] - with: - ros_distro: ${{ matrix.ROS_DISTRO }} - upstream_workspace: ros2_control.${{ matrix.ROS_DISTRO }}.repos - ref_for_scheduled_build: master - skip_packages: rqt_controller_manager diff --git a/.github/workflows/rolling-rhel-binary-build.yml b/.github/workflows/rolling-rhel-binary-build.yml deleted file mode 100644 index c8939d6015..0000000000 --- a/.github/workflows/rolling-rhel-binary-build.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: RHEL Rolling Semi-Binary Build -on: - workflow_dispatch: - pull_request: - branches: - - master - paths: - - '**.hpp' - - '**.h' - - '**.cpp' - - '**.py' - - '.github/workflows/rolling-rhel-binary-build.yml' - - '**/package.xml' - - '**/CMakeLists.txt' - - 'ros2_control.jazzy.repos' - schedule: - # Run every day to detect flakiness and broken dependencies - - cron: '03 1 * * *' - -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: [rolling] - with: - ros_distro: ${{ matrix.ROS_DISTRO }} - upstream_workspace: ros2_control.${{ matrix.ROS_DISTRO }}.repos - ref_for_scheduled_build: master - skip_packages: rqt_controller_manager diff --git a/.github/workflows/rolling-semi-binary-build.yml b/.github/workflows/rolling-semi-binary-build.yml deleted file mode 100644 index 4cdb7ab585..0000000000 --- a/.github/workflows/rolling-semi-binary-build.yml +++ /dev/null @@ -1,47 +0,0 @@ -name: Rolling Semi-Binary Build -# author: Denis Štogl -# description: 'Build & test all dependencies from released (binary) packages.' - -on: - workflow_dispatch: - pull_request: - branches: - - master - paths: - - '**.hpp' - - '**.h' - - '**.cpp' - - '**.py' - - '.github/workflows/rolling-semi-binary-build.yml' - - '**/package.xml' - - '**/CMakeLists.txt' - - 'ros2_control.rolling.repos' - push: - branches: - - master - paths: - - '**.hpp' - - '**.h' - - '**.cpp' - - '**.py' - - '.github/workflows/rolling-semi-binary-build.yml' - - '**/package.xml' - - '**/CMakeLists.txt' - - 'ros2_control.rolling.repos' - schedule: - # Run every morning to detect flakiness and broken dependencies - - cron: '03 1 * * *' - -jobs: - binary: - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master - strategy: - fail-fast: false - matrix: - ROS_DISTRO: [rolling] - ROS_REPO: [main, testing] - with: - ros_distro: ${{ matrix.ROS_DISTRO }} - ros_repo: ${{ matrix.ROS_REPO }} - upstream_workspace: ros2_control.${{ matrix.ROS_DISTRO }}.repos - ref_for_scheduled_build: master diff --git a/.github/workflows/rolling-source-build.yml b/.github/workflows/rolling-source-build.yml deleted file mode 100644 index 9bbf09cda4..0000000000 --- a/.github/workflows/rolling-source-build.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: Rolling Source Build -on: - workflow_dispatch: - push: - branches: - - master - paths: - - '**.hpp' - - '**.h' - - '**.cpp' - - '**.py' - - '.github/workflows/rolling-source-build.yml' - - '**/package.xml' - - '**/CMakeLists.txt' - - 'ros2_control.rolling.repos' - schedule: - # Run every day to detect flakiness and broken dependencies - - cron: '03 3 * * *' - -jobs: - source: - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-source-build.yml@master - with: - ros_distro: rolling - ref: master - ros2_repo_branch: master - container: ubuntu:24.04 From ba6e62d9f137592b13de4bc4fbbc6b92b39aa768 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Wed, 14 Aug 2024 11:43:40 +0000 Subject: [PATCH 05/11] Call coverage as python module --- controller_manager/test/test_spawner_unspawner.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/controller_manager/test/test_spawner_unspawner.cpp b/controller_manager/test/test_spawner_unspawner.cpp index 714d8e4db4..33d7e1139e 100644 --- a/controller_manager/test/test_spawner_unspawner.cpp +++ b/controller_manager/test/test_spawner_unspawner.cpp @@ -69,14 +69,15 @@ class TestLoadController : public ControllerManagerFixtureset_parameter(rclcpp::Parameter("ctrl_3.type", test_controller::TEST_CONTROLLER_CLASS_NAME)); std::stringstream ss; ss << "timeout --signal=INT 5 " - << "python3 -m $(ros2 pkg prefix controller_manager)/lib/controller_manager/spawner " + << "python3 -m coverage run $(ros2 pkg prefix " + "controller_manager)/lib/controller_manager/spawner " << "ctrl_3 -c test_controller_manager --unload-on-kill"; EXPECT_NE(std::system(ss.str().c_str()), 0) From 3840854d1f1d093015c3ee4c08713d3dd966e1f4 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Wed, 14 Aug 2024 11:43:51 +0000 Subject: [PATCH 06/11] Use --append and --branch options --- .../test/test_spawner_unspawner.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/controller_manager/test/test_spawner_unspawner.cpp b/controller_manager/test/test_spawner_unspawner.cpp index 33d7e1139e..fa27ee2c97 100644 --- a/controller_manager/test/test_spawner_unspawner.cpp +++ b/controller_manager/test/test_spawner_unspawner.cpp @@ -27,6 +27,7 @@ using ::testing::_; using ::testing::Return; +const char coveragepy_script[] = "python3 -m coverage run --append --branch"; using namespace std::chrono_literals; class TestLoadController : public ControllerManagerFixture @@ -69,16 +70,17 @@ class TestLoadController : public ControllerManagerFixtureset_parameter(rclcpp::Parameter("ctrl_3.type", test_controller::TEST_CONTROLLER_CLASS_NAME)); std::stringstream ss; ss << "timeout --signal=INT 5 " - << "python3 -m coverage run $(ros2 pkg prefix " - "controller_manager)/lib/controller_manager/spawner " + << std::string(coveragepy_script) + + " $(ros2 pkg prefix controller_manager)/lib/controller_manager/spawner " << "ctrl_3 -c test_controller_manager --unload-on-kill"; EXPECT_NE(std::system(ss.str().c_str()), 0) From f9f5c00bed4608551bb7c8980bf3f564abd1522c Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Wed, 14 Aug 2024 11:43:51 +0000 Subject: [PATCH 07/11] Add coverage.py as dependency --- controller_manager/package.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/controller_manager/package.xml b/controller_manager/package.xml index 47b640c892..4bd60a5083 100644 --- a/controller_manager/package.xml +++ b/controller_manager/package.xml @@ -31,6 +31,7 @@ ament_cmake_gmock ament_cmake_pytest + python-coverage hardware_interface_testing ros2_control_test_assets From 98c5b5a371fff93c0e2bf44a9d94e0337d6a4e80 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Wed, 14 Aug 2024 11:43:51 +0000 Subject: [PATCH 08/11] Revert "Temporarily delete wfs" This reverts commit a795f9f5933019c70f38d6ba2c31f698bc50f6d7. --- .github/workflows/jazzy-abi-compatibility.yml | 27 +++++++++++ .github/workflows/jazzy-binary-build.yml | 47 +++++++++++++++++++ .github/workflows/jazzy-check-docs.yml | 18 +++++++ .github/workflows/jazzy-coverage-build.yml | 35 ++++++++++++++ .github/workflows/jazzy-debian-build.yml | 32 +++++++++++++ .github/workflows/jazzy-pre-commit.yml | 13 +++++ .github/workflows/jazzy-rhel-binary-build.yml | 31 ++++++++++++ .github/workflows/jazzy-semi-binary-build.yml | 47 +++++++++++++++++++ .github/workflows/jazzy-source-build.yml | 27 +++++++++++ .../workflows/rolling-abi-compatibility.yml | 27 +++++++++++ .github/workflows/rolling-binary-build.yml | 47 +++++++++++++++++++ .github/workflows/rolling-check-docs.yml | 19 ++++++++ .github/workflows/rolling-debian-build.yml | 32 +++++++++++++ .../workflows/rolling-rhel-binary-build.yml | 31 ++++++++++++ .../workflows/rolling-semi-binary-build.yml | 47 +++++++++++++++++++ .github/workflows/rolling-source-build.yml | 27 +++++++++++ 16 files changed, 507 insertions(+) create mode 100644 .github/workflows/jazzy-abi-compatibility.yml create mode 100644 .github/workflows/jazzy-binary-build.yml create mode 100644 .github/workflows/jazzy-check-docs.yml create mode 100644 .github/workflows/jazzy-coverage-build.yml create mode 100644 .github/workflows/jazzy-debian-build.yml create mode 100644 .github/workflows/jazzy-pre-commit.yml create mode 100644 .github/workflows/jazzy-rhel-binary-build.yml create mode 100644 .github/workflows/jazzy-semi-binary-build.yml create mode 100644 .github/workflows/jazzy-source-build.yml create mode 100644 .github/workflows/rolling-abi-compatibility.yml create mode 100644 .github/workflows/rolling-binary-build.yml create mode 100644 .github/workflows/rolling-check-docs.yml create mode 100644 .github/workflows/rolling-debian-build.yml create mode 100644 .github/workflows/rolling-rhel-binary-build.yml create mode 100644 .github/workflows/rolling-semi-binary-build.yml create mode 100644 .github/workflows/rolling-source-build.yml diff --git a/.github/workflows/jazzy-abi-compatibility.yml b/.github/workflows/jazzy-abi-compatibility.yml new file mode 100644 index 0000000000..367b3736fb --- /dev/null +++ b/.github/workflows/jazzy-abi-compatibility.yml @@ -0,0 +1,27 @@ +name: Jazzy - ABI Compatibility Check +on: + workflow_dispatch: + pull_request: + branches: + - master + paths: + - '**.hpp' + - '**.h' + - '**.cpp' + - '**.py' + - '.github/workflows/jazzy-abi-compatibility.yml' + - '**/package.xml' + - '**/CMakeLists.txt' + - 'ros2_control-not-released.jazzy.repos' + +jobs: + abi_check: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: ros-industrial/industrial_ci@master + env: + ROS_DISTRO: jazzy + ROS_REPO: testing + ABICHECK_URL: github:${{ github.repository }}#${{ github.base_ref }} + NOT_TEST_BUILD: true diff --git a/.github/workflows/jazzy-binary-build.yml b/.github/workflows/jazzy-binary-build.yml new file mode 100644 index 0000000000..5be853ebfc --- /dev/null +++ b/.github/workflows/jazzy-binary-build.yml @@ -0,0 +1,47 @@ +name: Jazzy Binary Build +# author: Denis Štogl +# description: 'Build & test all dependencies from released (binary) packages.' + +on: + workflow_dispatch: + pull_request: + branches: + - master + paths: + - '**.hpp' + - '**.h' + - '**.cpp' + - '**.py' + - '.github/workflows/jazzy-binary-build.yml' + - '**/package.xml' + - '**/CMakeLists.txt' + - 'ros2_control-not-released.jazzy.repos' + push: + branches: + - master + paths: + - '**.hpp' + - '**.h' + - '**.cpp' + - '**.py' + - '.github/workflows/jazzy-binary-build.yml' + - '**/package.xml' + - '**/CMakeLists.txt' + - 'ros2_control-not-released.jazzy.repos' + schedule: + # Run every morning to detect flakiness and broken dependencies + - cron: '03 1 * * *' + +jobs: + binary: + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master + strategy: + fail-fast: false + matrix: + ROS_DISTRO: [jazzy] + 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: master diff --git a/.github/workflows/jazzy-check-docs.yml b/.github/workflows/jazzy-check-docs.yml new file mode 100644 index 0000000000..cbdf6c30bd --- /dev/null +++ b/.github/workflows/jazzy-check-docs.yml @@ -0,0 +1,18 @@ +name: Jazzy Check Docs + +on: + workflow_dispatch: + pull_request: + branches: + - master + paths: + - '**.rst' + - '**.md' + - '**.yaml' + +jobs: + check-docs: + name: Check Docs + uses: ros-controls/control.ros.org/.github/workflows/reusable-sphinx-check-single-version.yml@jazzy + with: + ROS2_CONTROL_PR: ${{ github.ref }} diff --git a/.github/workflows/jazzy-coverage-build.yml b/.github/workflows/jazzy-coverage-build.yml new file mode 100644 index 0000000000..aa345d1e80 --- /dev/null +++ b/.github/workflows/jazzy-coverage-build.yml @@ -0,0 +1,35 @@ +name: Coverage Build - Jazzy +on: + workflow_dispatch: + # TODO(anyone) activate when branched for Jazzy + # push: + # branches: + # - master + # paths: + # - '**.hpp' + # - '**.h' + # - '**.cpp' + # - '.github/workflows/jazzy-coverage-build.yml' + # - '**/package.xml' + # - '**/CMakeLists.txt' + # - 'ros2_control.jazzy.repos' + # - 'codecov.yml' + # pull_request: + # branches: + # - master + # paths: + # - '**.hpp' + # - '**.h' + # - '**.cpp' + # - '.github/workflows/jazzy-coverage-build.yml' + # - '**/package.xml' + # - '**/CMakeLists.txt' + # - 'ros2_control.jazzy.repos' + # - 'codecov.yml' + +jobs: + coverage_jazzy: + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@master + secrets: inherit + with: + ros_distro: jazzy diff --git a/.github/workflows/jazzy-debian-build.yml b/.github/workflows/jazzy-debian-build.yml new file mode 100644 index 0000000000..4ec6a29fff --- /dev/null +++ b/.github/workflows/jazzy-debian-build.yml @@ -0,0 +1,32 @@ +name: Debian Jazzy Source Build +on: + workflow_dispatch: + pull_request: + branches: + - master + paths: + - '**.hpp' + - '**.h' + - '**.cpp' + - '**.py' + - '.github/workflows/jazzy-debian-build.yml' + - '**/package.xml' + - '**/CMakeLists.txt' + - 'ros2_control.jazzy.repos' + schedule: + # Run every day to detect flakiness and broken dependencies + - cron: '03 1 * * *' + + +jobs: + debian_source_build: + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-debian-build.yml@master + strategy: + fail-fast: false + matrix: + ROS_DISTRO: [jazzy] + with: + ros_distro: ${{ matrix.ROS_DISTRO }} + upstream_workspace: ros2_control.${{ matrix.ROS_DISTRO }}.repos + ref_for_scheduled_build: master + skip_packages: rqt_controller_manager diff --git a/.github/workflows/jazzy-pre-commit.yml b/.github/workflows/jazzy-pre-commit.yml new file mode 100644 index 0000000000..d9ec610bbc --- /dev/null +++ b/.github/workflows/jazzy-pre-commit.yml @@ -0,0 +1,13 @@ +name: Pre-Commit - Jazzy + +on: + workflow_dispatch: + pull_request: + branches: + - master + +jobs: + pre-commit: + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master + with: + ros_distro: jazzy diff --git a/.github/workflows/jazzy-rhel-binary-build.yml b/.github/workflows/jazzy-rhel-binary-build.yml new file mode 100644 index 0000000000..0dcc912dab --- /dev/null +++ b/.github/workflows/jazzy-rhel-binary-build.yml @@ -0,0 +1,31 @@ +name: RHEL Jazzy Semi-Binary Build +on: + workflow_dispatch: + pull_request: + branches: + - master + paths: + - '**.hpp' + - '**.h' + - '**.cpp' + - '**.py' + - '.github/workflows/jazzy-rhel-binary-build.yml' + - '**/package.xml' + - '**/CMakeLists.txt' + - 'ros2_control.jazzy.repos' + schedule: + # Run every day to detect flakiness and broken dependencies + - cron: '03 1 * * *' + +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: [jazzy] + with: + ros_distro: ${{ matrix.ROS_DISTRO }} + upstream_workspace: ros2_control.${{ matrix.ROS_DISTRO }}.repos + ref_for_scheduled_build: master + skip_packages: rqt_controller_manager diff --git a/.github/workflows/jazzy-semi-binary-build.yml b/.github/workflows/jazzy-semi-binary-build.yml new file mode 100644 index 0000000000..9634732cf9 --- /dev/null +++ b/.github/workflows/jazzy-semi-binary-build.yml @@ -0,0 +1,47 @@ +name: Jazzy Semi-Binary Build +# author: Denis Štogl +# description: 'Build & test all dependencies from released (binary) packages.' + +on: + workflow_dispatch: + pull_request: + branches: + - master + paths: + - '**.hpp' + - '**.h' + - '**.cpp' + - '**.py' + - '.github/workflows/jazzy-semi-binary-build.yml' + - '**/package.xml' + - '**/CMakeLists.txt' + - 'ros2_control.jazzy.repos' + push: + branches: + - master + paths: + - '**.hpp' + - '**.h' + - '**.cpp' + - '**.py' + - '.github/workflows/jazzy-semi-binary-build.yml' + - '**/package.xml' + - '**/CMakeLists.txt' + - 'ros2_control.jazzy.repos' + schedule: + # Run every morning to detect flakiness and broken dependencies + - cron: '03 1 * * *' + +jobs: + binary: + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master + strategy: + fail-fast: false + matrix: + ROS_DISTRO: [jazzy] + ROS_REPO: [main, testing] + with: + ros_distro: ${{ matrix.ROS_DISTRO }} + ros_repo: ${{ matrix.ROS_REPO }} + upstream_workspace: ros2_control.${{ matrix.ROS_DISTRO }}.repos + ref_for_scheduled_build: master diff --git a/.github/workflows/jazzy-source-build.yml b/.github/workflows/jazzy-source-build.yml new file mode 100644 index 0000000000..65066a4bf2 --- /dev/null +++ b/.github/workflows/jazzy-source-build.yml @@ -0,0 +1,27 @@ +name: Jazzy Source Build +on: + workflow_dispatch: + push: + branches: + - master + paths: + - '**.hpp' + - '**.h' + - '**.cpp' + - '**.py' + - '.github/workflows/jazzy-source-build.yml' + - '**/package.xml' + - '**/CMakeLists.txt' + - 'ros2_control.jazzy.repos' + schedule: + # Run every day to detect flakiness and broken dependencies + - cron: '03 3 * * *' + +jobs: + source: + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-source-build.yml@master + with: + ros_distro: jazzy + ref: master + ros2_repo_branch: master + container: ubuntu:24.04 diff --git a/.github/workflows/rolling-abi-compatibility.yml b/.github/workflows/rolling-abi-compatibility.yml new file mode 100644 index 0000000000..b7828390fb --- /dev/null +++ b/.github/workflows/rolling-abi-compatibility.yml @@ -0,0 +1,27 @@ +name: Rolling - ABI Compatibility Check +on: + workflow_dispatch: + pull_request: + branches: + - master + paths: + - '**.hpp' + - '**.h' + - '**.cpp' + - '**.py' + - '.github/workflows/rolling-abi-compatibility.yml' + - '**/package.xml' + - '**/CMakeLists.txt' + - 'ros2_control-not-released.rolling.repos' + +jobs: + abi_check: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: ros-industrial/industrial_ci@master + env: + ROS_DISTRO: rolling + ROS_REPO: testing + ABICHECK_URL: github:${{ github.repository }}#${{ github.base_ref }} + NOT_TEST_BUILD: true diff --git a/.github/workflows/rolling-binary-build.yml b/.github/workflows/rolling-binary-build.yml new file mode 100644 index 0000000000..24a28f16ae --- /dev/null +++ b/.github/workflows/rolling-binary-build.yml @@ -0,0 +1,47 @@ +name: Rolling Binary Build +# author: Denis Štogl +# description: 'Build & test all dependencies from released (binary) packages.' + +on: + workflow_dispatch: + pull_request: + branches: + - master + paths: + - '**.hpp' + - '**.h' + - '**.cpp' + - '**.py' + - '.github/workflows/rolling-binary-build.yml' + - '**/package.xml' + - '**/CMakeLists.txt' + - 'ros2_control-not-released.rolling.repos' + push: + branches: + - master + paths: + - '**.hpp' + - '**.h' + - '**.cpp' + - '**.py' + - '.github/workflows/rolling-binary-build.yml' + - '**/package.xml' + - '**/CMakeLists.txt' + - 'ros2_control-not-released.rolling.repos' + schedule: + # Run every morning to detect flakiness and broken dependencies + - cron: '03 1 * * *' + +jobs: + binary: + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master + strategy: + fail-fast: false + matrix: + ROS_DISTRO: [rolling] + 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: master diff --git a/.github/workflows/rolling-check-docs.yml b/.github/workflows/rolling-check-docs.yml new file mode 100644 index 0000000000..bd83c0caca --- /dev/null +++ b/.github/workflows/rolling-check-docs.yml @@ -0,0 +1,19 @@ +name: Rolling Check Docs + +on: + workflow_dispatch: + pull_request: + branches: + - master + paths: + - '**.rst' + - '**.md' + - '**.yaml' + - '.github/workflows/rolling-check-docs.yml' + +jobs: + check-docs: + name: Check Docs + uses: ros-controls/control.ros.org/.github/workflows/reusable-sphinx-check-single-version.yml@rolling + with: + ROS2_CONTROL_PR: ${{ github.ref }} diff --git a/.github/workflows/rolling-debian-build.yml b/.github/workflows/rolling-debian-build.yml new file mode 100644 index 0000000000..00d4ad844b --- /dev/null +++ b/.github/workflows/rolling-debian-build.yml @@ -0,0 +1,32 @@ +name: Debian Rolling Source Build +on: + workflow_dispatch: + pull_request: + branches: + - master + paths: + - '**.hpp' + - '**.h' + - '**.cpp' + - '**.py' + - '.github/workflows/rolling-debian-build.yml' + - '**/package.xml' + - '**/CMakeLists.txt' + - 'ros2_control.rolling.repos' + schedule: + # Run every day to detect flakiness and broken dependencies + - cron: '03 1 * * *' + + +jobs: + debian_source_build: + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-debian-build.yml@master + strategy: + fail-fast: false + matrix: + ROS_DISTRO: [rolling] + with: + ros_distro: ${{ matrix.ROS_DISTRO }} + upstream_workspace: ros2_control.${{ matrix.ROS_DISTRO }}.repos + ref_for_scheduled_build: master + skip_packages: rqt_controller_manager diff --git a/.github/workflows/rolling-rhel-binary-build.yml b/.github/workflows/rolling-rhel-binary-build.yml new file mode 100644 index 0000000000..c8939d6015 --- /dev/null +++ b/.github/workflows/rolling-rhel-binary-build.yml @@ -0,0 +1,31 @@ +name: RHEL Rolling Semi-Binary Build +on: + workflow_dispatch: + pull_request: + branches: + - master + paths: + - '**.hpp' + - '**.h' + - '**.cpp' + - '**.py' + - '.github/workflows/rolling-rhel-binary-build.yml' + - '**/package.xml' + - '**/CMakeLists.txt' + - 'ros2_control.jazzy.repos' + schedule: + # Run every day to detect flakiness and broken dependencies + - cron: '03 1 * * *' + +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: [rolling] + with: + ros_distro: ${{ matrix.ROS_DISTRO }} + upstream_workspace: ros2_control.${{ matrix.ROS_DISTRO }}.repos + ref_for_scheduled_build: master + skip_packages: rqt_controller_manager diff --git a/.github/workflows/rolling-semi-binary-build.yml b/.github/workflows/rolling-semi-binary-build.yml new file mode 100644 index 0000000000..4cdb7ab585 --- /dev/null +++ b/.github/workflows/rolling-semi-binary-build.yml @@ -0,0 +1,47 @@ +name: Rolling Semi-Binary Build +# author: Denis Štogl +# description: 'Build & test all dependencies from released (binary) packages.' + +on: + workflow_dispatch: + pull_request: + branches: + - master + paths: + - '**.hpp' + - '**.h' + - '**.cpp' + - '**.py' + - '.github/workflows/rolling-semi-binary-build.yml' + - '**/package.xml' + - '**/CMakeLists.txt' + - 'ros2_control.rolling.repos' + push: + branches: + - master + paths: + - '**.hpp' + - '**.h' + - '**.cpp' + - '**.py' + - '.github/workflows/rolling-semi-binary-build.yml' + - '**/package.xml' + - '**/CMakeLists.txt' + - 'ros2_control.rolling.repos' + schedule: + # Run every morning to detect flakiness and broken dependencies + - cron: '03 1 * * *' + +jobs: + binary: + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master + strategy: + fail-fast: false + matrix: + ROS_DISTRO: [rolling] + ROS_REPO: [main, testing] + with: + ros_distro: ${{ matrix.ROS_DISTRO }} + ros_repo: ${{ matrix.ROS_REPO }} + upstream_workspace: ros2_control.${{ matrix.ROS_DISTRO }}.repos + ref_for_scheduled_build: master diff --git a/.github/workflows/rolling-source-build.yml b/.github/workflows/rolling-source-build.yml new file mode 100644 index 0000000000..9bbf09cda4 --- /dev/null +++ b/.github/workflows/rolling-source-build.yml @@ -0,0 +1,27 @@ +name: Rolling Source Build +on: + workflow_dispatch: + push: + branches: + - master + paths: + - '**.hpp' + - '**.h' + - '**.cpp' + - '**.py' + - '.github/workflows/rolling-source-build.yml' + - '**/package.xml' + - '**/CMakeLists.txt' + - 'ros2_control.rolling.repos' + schedule: + # Run every day to detect flakiness and broken dependencies + - cron: '03 3 * * *' + +jobs: + source: + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-source-build.yml@master + with: + ros_distro: rolling + ref: master + ros2_repo_branch: master + container: ubuntu:24.04 From 89ed1650a67c8035d8bc4682dde31d8f3bac231f Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Wed, 14 Aug 2024 11:43:51 +0000 Subject: [PATCH 09/11] Fix dependency --- controller_manager/package.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controller_manager/package.xml b/controller_manager/package.xml index 4bd60a5083..9f9a9bf796 100644 --- a/controller_manager/package.xml +++ b/controller_manager/package.xml @@ -31,7 +31,7 @@ ament_cmake_gmock ament_cmake_pytest - python-coverage + python3-coverage hardware_interface_testing ros2_control_test_assets From 008a74847406762a0c286cc03ffe2908e5bd0673 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Wed, 14 Aug 2024 11:43:51 +0000 Subject: [PATCH 10/11] Don't exclude test folders --- codecov.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/codecov.yml b/codecov.yml index 97106f32ff..764afc34e6 100644 --- a/codecov.yml +++ b/codecov.yml @@ -14,8 +14,6 @@ fixes: comment: layout: "diff, flags, files" behavior: default -ignore: - - "**/test" flags: unittests: paths: From 7fa5b1f88af9ccec6a1c86fc05652462fc637057 Mon Sep 17 00:00:00 2001 From: Bence Magyar Date: Wed, 14 Aug 2024 11:53:07 +0100 Subject: [PATCH 11/11] use upstream CI version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Christoph Fröhlich --- .github/workflows/rolling-coverage-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rolling-coverage-build.yml b/.github/workflows/rolling-coverage-build.yml index 5c2f3d3d4c..45b10876e7 100644 --- a/.github/workflows/rolling-coverage-build.yml +++ b/.github/workflows/rolling-coverage-build.yml @@ -30,7 +30,7 @@ on: jobs: coverage_rolling: - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@coveragepy + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@master secrets: inherit with: ros_distro: rolling