From 02cdef016c64293a817c0478cc7399f45cd091a0 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Sun, 18 Feb 2024 18:11:19 +0000 Subject: [PATCH 01/12] Use wf from ros2_control_ci for coverage build --- .github/workflows/build-coverage.yml | 44 ++++------------------------ 1 file changed, 5 insertions(+), 39 deletions(-) diff --git a/.github/workflows/build-coverage.yml b/.github/workflows/build-coverage.yml index 5e894e25..2e04364d 100644 --- a/.github/workflows/build-coverage.yml +++ b/.github/workflows/build-coverage.yml @@ -9,42 +9,8 @@ on: - ros2-master jobs: - coverage: - name: coverage build - runs-on: ubuntu-22.04 - strategy: - fail-fast: false - env: - ROS_DISTRO: rolling - steps: - - uses: ros-tooling/setup-ros@0.7.1 - with: - required-ros-distributions: ${{ env.ROS_DISTRO }} - - uses: actions/checkout@v4 - - uses: ros-tooling/action-ros-ci@0.3.6 - with: - target-ros2-distro: ${{ env.ROS_DISTRO }} - import-token: ${{ secrets.GITHUB_TOKEN }} - # build all packages listed here - package-name: - control_toolbox - - vcs-repo-file-url: | - https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }}/control_toolbox.${{ env.ROS_DISTRO }}.repos?token=${{ secrets.GITHUB_TOKEN }} - colcon-defaults: | - { - "build": { - "mixin": ["coverage-gcc"] - } - } - colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml - - uses: codecov/codecov-action@v4.0.1 - with: - file: ros_ws/lcov/total_coverage.info - flags: unittests - name: codecov-umbrella - token: ${{ secrets.CODECOV_TOKEN }} - - uses: actions/upload-artifact@v4.3.1 - with: - name: colcon-logs-coverage-rolling - path: ros_ws/log + coverage_rolling: + name: coverage build - rolling + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@ci_coverage_build + with: + ros_distro: rolling From 4ce2c330697d2b1983e3c416aa31cbb02b9857ca Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Sun, 18 Feb 2024 19:01:18 +0000 Subject: [PATCH 02/12] Add secret --- .github/workflows/build-coverage.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-coverage.yml b/.github/workflows/build-coverage.yml index 2e04364d..7332624f 100644 --- a/.github/workflows/build-coverage.yml +++ b/.github/workflows/build-coverage.yml @@ -14,3 +14,4 @@ jobs: uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@ci_coverage_build with: ros_distro: rolling + secrets: inherit From ffcfaab3e9a3793059b7fdc6a4c383ae14b1ef7c Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Sun, 18 Feb 2024 19:04:41 +0000 Subject: [PATCH 03/12] Fix secrets syntax --- .github/workflows/build-coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-coverage.yml b/.github/workflows/build-coverage.yml index 7332624f..05deac59 100644 --- a/.github/workflows/build-coverage.yml +++ b/.github/workflows/build-coverage.yml @@ -12,6 +12,6 @@ jobs: coverage_rolling: name: coverage build - rolling uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@ci_coverage_build + secrets: inherit with: ros_distro: rolling - secrets: inherit From 60dfa5f3a331e212b57455174f7a06556d133a97 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Sun, 18 Feb 2024 19:13:38 +0000 Subject: [PATCH 04/12] Remove secret --- .github/workflows/build-coverage.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-coverage.yml b/.github/workflows/build-coverage.yml index 05deac59..2e04364d 100644 --- a/.github/workflows/build-coverage.yml +++ b/.github/workflows/build-coverage.yml @@ -12,6 +12,5 @@ jobs: coverage_rolling: name: coverage build - rolling uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@ci_coverage_build - secrets: inherit with: ros_distro: rolling From 9f8b585640508942fe645d4d147d08f38a5d4cc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Wed, 21 Feb 2024 21:53:31 +0100 Subject: [PATCH 05/12] Switch to master branch --- .github/workflows/build-coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-coverage.yml b/.github/workflows/build-coverage.yml index 2e04364d..173629a4 100644 --- a/.github/workflows/build-coverage.yml +++ b/.github/workflows/build-coverage.yml @@ -11,6 +11,6 @@ on: jobs: coverage_rolling: name: coverage build - rolling - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@ci_coverage_build + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@master with: ros_distro: rolling From 7cdd0e04113fd6692f6c11f71f14b7d08d82f34a Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Fri, 23 Feb 2024 07:31:52 +0000 Subject: [PATCH 06/12] Revert "Remove secret" This reverts commit 60dfa5f3a331e212b57455174f7a06556d133a97. --- .github/workflows/build-coverage.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-coverage.yml b/.github/workflows/build-coverage.yml index 173629a4..406a9295 100644 --- a/.github/workflows/build-coverage.yml +++ b/.github/workflows/build-coverage.yml @@ -12,5 +12,6 @@ jobs: coverage_rolling: name: coverage build - rolling uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@master + secrets: inherit with: ros_distro: rolling From 4b8000aa656fbbe7560d75e05cfff63884c97864 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 27 Feb 2024 18:25:15 +0000 Subject: [PATCH 07/12] Fix path for codecov --- codecov.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codecov.yml b/codecov.yml index ac6e323a..c61f913e 100644 --- a/codecov.yml +++ b/codecov.yml @@ -8,7 +8,7 @@ coverage: informational: true patch: off fixes: - - "ros_ws/src/control_toolbox/::" + - "ros_ws/src/*/control_toolbox/::" ignore: - "**/test" - "test" From f54b862f53efa29e89e171e877f36ca255fe7324 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 27 Feb 2024 19:22:15 +0000 Subject: [PATCH 08/12] Revert "Fix path for codecov" This reverts commit 4b8000aa656fbbe7560d75e05cfff63884c97864. --- codecov.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codecov.yml b/codecov.yml index c61f913e..ac6e323a 100644 --- a/codecov.yml +++ b/codecov.yml @@ -8,7 +8,7 @@ coverage: informational: true patch: off fixes: - - "ros_ws/src/*/control_toolbox/::" + - "ros_ws/src/control_toolbox/::" ignore: - "**/test" - "test" From f5277a3e01eaea3557651e5d66a178df56f002b7 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 27 Feb 2024 19:23:41 +0000 Subject: [PATCH 09/12] test change in coverage wf --- .github/workflows/build-coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-coverage.yml b/.github/workflows/build-coverage.yml index 406a9295..f76656b4 100644 --- a/.github/workflows/build-coverage.yml +++ b/.github/workflows/build-coverage.yml @@ -11,7 +11,7 @@ on: jobs: coverage_rolling: name: coverage build - 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@lcov_paths secrets: inherit with: ros_distro: rolling From c2b2e923da32bfa961930cd55195c9ac7b340875 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Wed, 28 Feb 2024 19:13:53 +0100 Subject: [PATCH 10/12] Go back to master branch --- .github/workflows/build-coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-coverage.yml b/.github/workflows/build-coverage.yml index f76656b4..406a9295 100644 --- a/.github/workflows/build-coverage.yml +++ b/.github/workflows/build-coverage.yml @@ -11,7 +11,7 @@ on: jobs: coverage_rolling: name: coverage build - rolling - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@lcov_paths + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@master secrets: inherit with: ros_distro: rolling From c376a677c6cecfa6ce09a0adf8c925178b48aa4d Mon Sep 17 00:00:00 2001 From: "Felix Exner (fexner)" Date: Thu, 29 Feb 2024 12:47:18 +0100 Subject: [PATCH 11/12] Use my current testing workflow --- .github/workflows/build-coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-coverage.yml b/.github/workflows/build-coverage.yml index 406a9295..4cf5a83f 100644 --- a/.github/workflows/build-coverage.yml +++ b/.github/workflows/build-coverage.yml @@ -11,7 +11,7 @@ on: jobs: coverage_rolling: name: coverage build - rolling - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@master + uses: fmauch/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@patch-1 secrets: inherit with: ros_distro: rolling From 8daccf77e0cba72285fc3f50b1868383be00b4d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Fri, 1 Mar 2024 08:33:35 +0000 Subject: [PATCH 12/12] Revert "Use my current testing workflow" This reverts commit c376a677c6cecfa6ce09a0adf8c925178b48aa4d. --- .github/workflows/build-coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-coverage.yml b/.github/workflows/build-coverage.yml index 4cf5a83f..406a9295 100644 --- a/.github/workflows/build-coverage.yml +++ b/.github/workflows/build-coverage.yml @@ -11,7 +11,7 @@ on: jobs: coverage_rolling: name: coverage build - rolling - uses: fmauch/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@patch-1 + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@master secrets: inherit with: ros_distro: rolling