From 6848a85f262fcd3cd5e5eece9138f4b220600ba1 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Mon, 11 Dec 2023 19:33:29 +0000 Subject: [PATCH 1/5] Rename workflows --- .github/workflows/build-source_humble.yml | 2 +- .github/workflows/build-source_iron.yml | 2 +- .github/workflows/build-source_rollling.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-source_humble.yml b/.github/workflows/build-source_humble.yml index 9d423c16..4cf8d966 100644 --- a/.github/workflows/build-source_humble.yml +++ b/.github/workflows/build-source_humble.yml @@ -1,4 +1,4 @@ -name: Rolling Source Build +name: Source Build - Humble on: workflow_dispatch: push: diff --git a/.github/workflows/build-source_iron.yml b/.github/workflows/build-source_iron.yml index 125d18ed..3ec6feb6 100644 --- a/.github/workflows/build-source_iron.yml +++ b/.github/workflows/build-source_iron.yml @@ -1,4 +1,4 @@ -name: Rolling Source Build +name: Source Build - Iron on: workflow_dispatch: push: diff --git a/.github/workflows/build-source_rollling.yml b/.github/workflows/build-source_rollling.yml index 7942aaa8..edec1963 100644 --- a/.github/workflows/build-source_rollling.yml +++ b/.github/workflows/build-source_rollling.yml @@ -1,4 +1,4 @@ -name: Rolling Source Build +name: Source Build - Rolling on: workflow_dispatch: push: From dc6f1622080900280db753aecc31dc1eabcbfd91 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Mon, 11 Dec 2023 19:33:45 +0000 Subject: [PATCH 2/5] Fix name of repos file --- .github/workflows/reusable-ros-tooling-source-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reusable-ros-tooling-source-build.yml b/.github/workflows/reusable-ros-tooling-source-build.yml index 4f4ad7dd..cbfc470b 100644 --- a/.github/workflows/reusable-ros-tooling-source-build.yml +++ b/.github/workflows/reusable-ros-tooling-source-build.yml @@ -42,7 +42,7 @@ jobs: vcs-repo-file-url: | https://raw.githubusercontent.com/ros2/ros2/${{ inputs.ros2_repo_branch }}/ros2.repos - https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }}/ros2_controllers.${{ inputs.ros_distro }}.repos?token=${{ secrets.GITHUB_TOKEN }} + https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }}/control_toolbox.${{ inputs.ros_distro }}.repos?token=${{ secrets.GITHUB_TOKEN }} colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml - uses: actions/upload-artifact@v3.1.3 with: From fcb4b9a322a74a568de87f1ef4561d4353a6beef Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Mon, 11 Dec 2023 19:39:00 +0000 Subject: [PATCH 3/5] Fix readme --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6c6ac611..78833bc7 100644 --- a/README.md +++ b/README.md @@ -7,9 +7,9 @@ See the documentation of [ros2_control](http://control.ros.org) and release info ## Build status ROS2 Distro | Branch | Build status | Documentation | Released packages :---------: | :----: | :----------: | :-----------: | :---------------: -**Rolling** | [`master`](https://github.com/ros-controls/control_toolbox/tree/master) | [![Build rolling](https://github.com/ros-controls/control_toolbox/actions/workflows/build-rolling.yml/badge.svg)](https://github.com/ros-controls/control_toolbox/actions/workflows/build-rolling.yml)
[![Build Source rolling](https://github.com/ros-controls/control_toolbox/actions/workflows/build-source-rollling.yml/badge.svg)](https://github.com/ros-controls/control_toolbox/actions/workflows/build-source-rollling.yml) | [API](http://docs.ros.org/en/rolling/p/control_toolbox/) | [control_toolbox](https://index.ros.org/p/control_toolbox/#rolling) -**Iron** | [`master`](https://github.com/ros-controls/control_toolbox/tree/master) | n/a | [API](http://docs.ros.org/en/iron/p/control_toolbox/) | [control_toolbox](https://index.ros.org/p/control_toolbox/#iron) -**Humble** | [`master`](https://github.com/ros-controls/control_toolbox/tree/master) | [![Build humble](https://github.com/ros-controls/control_toolbox/actions/workflows/build-humble.yml/badge.svg)](https://github.com/ros-controls/control_toolbox/actions/workflows/build-humble.yml)
[![Build Source humble](https://github.com/ros-controls/control_toolbox/actions/workflows/build_source_humble.yml/badge.svg)](https://github.com/ros-controls/control_toolbox/actions/workflows/build_source_humble.yml) | [API](http://docs.ros.org/en/humble/p/control_toolbox/) | [control_toolbox](https://index.ros.org/p/control_toolbox/#humble) +**Rolling** | [`master`](https://github.com/ros-controls/control_toolbox/tree/master) | [![Build rolling](https://github.com/ros-controls/control_toolbox/actions/workflows/build-rolling.yml/badge.svg)](https://github.com/ros-controls/control_toolbox/actions/workflows/build-rolling.yml)
[![Rolling Source Build](https://github.com/ros-controls/control_toolbox/actions/workflows/build-source_rollling.yml/badge.svg)](https://github.com/ros-controls/control_toolbox/actions/workflows/build-source_rollling.yml) | [API](http://docs.ros.org/en/rolling/p/control_toolbox/) | [control_toolbox](https://index.ros.org/p/control_toolbox/#rolling) +**Iron** | [`master`](https://github.com/ros-controls/control_toolbox/tree/master) | [![Build iron](https://github.com/ros-controls/control_toolbox/actions/workflows/build-iron.yml/badge.svg)](https://github.com/ros-controls/control_toolbox/actions/workflows/build-iron.yml)
[![Iron Source Build](https://github.com/ros-controls/control_toolbox/actions/workflows/build-source_iron.yml/badge.svg)](https://github.com/ros-controls/control_toolbox/actions/workflows/build-source_iron.yml) | [API](http://docs.ros.org/en/iron/p/control_toolbox/) | [control_toolbox](https://index.ros.org/p/control_toolbox/#iron) +**Humble** | [`master`](https://github.com/ros-controls/control_toolbox/tree/master) | [![Build humble](https://github.com/ros-controls/control_toolbox/actions/workflows/build-humble.yml/badge.svg)](https://github.com/ros-controls/control_toolbox/actions/workflows/build-humble.yml)
[![Humble Source Build](https://github.com/ros-controls/control_toolbox/actions/workflows/build-source_humble.yml/badge.svg)](https://github.com/ros-controls/control_toolbox/actions/workflows/build-source_humble.yml) | [API](http://docs.ros.org/en/humble/p/control_toolbox/) | [control_toolbox](https://index.ros.org/p/control_toolbox/#humble) ## Publication From dac19560f45e6905cff27a688e1c521c2006c23d Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Mon, 11 Dec 2023 19:56:06 +0000 Subject: [PATCH 4/5] Explicitly set token for codecov-action --- .github/workflows/build-coverage.yml | 1 + .github/workflows/build-coverage_humble.yml | 1 + .github/workflows/build-coverage_iron.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/build-coverage.yml b/.github/workflows/build-coverage.yml index b80550ee..2767e115 100644 --- a/.github/workflows/build-coverage.yml +++ b/.github/workflows/build-coverage.yml @@ -43,6 +43,7 @@ jobs: file: ros_ws/lcov/total_coverage.info flags: unittests name: codecov-umbrella + token: ${{ secrets.CODECOV_TOKEN }} - uses: actions/upload-artifact@v3.1.3 with: name: colcon-logs-coverage-rolling diff --git a/.github/workflows/build-coverage_humble.yml b/.github/workflows/build-coverage_humble.yml index 6b5d4cbd..b54c8ee5 100644 --- a/.github/workflows/build-coverage_humble.yml +++ b/.github/workflows/build-coverage_humble.yml @@ -43,6 +43,7 @@ jobs: file: ros_ws/lcov/total_coverage.info flags: unittests name: codecov-umbrella + token: ${{ secrets.CODECOV_TOKEN }} - uses: actions/upload-artifact@v3.1.3 with: name: colcon-logs-coverage-humble diff --git a/.github/workflows/build-coverage_iron.yml b/.github/workflows/build-coverage_iron.yml index 5e0f1954..179b1d8e 100644 --- a/.github/workflows/build-coverage_iron.yml +++ b/.github/workflows/build-coverage_iron.yml @@ -43,6 +43,7 @@ jobs: file: ros_ws/lcov/total_coverage.info flags: unittests name: codecov-umbrella + token: ${{ secrets.CODECOV_TOKEN }} - uses: actions/upload-artifact@v3.1.3 with: name: colcon-logs-coverage-iron From 03480994f1eb7cfddd94fd93b49b2c89e5782fae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Tue, 12 Dec 2023 09:15:25 +0100 Subject: [PATCH 5/5] Update codecov.yml --- codecov.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/codecov.yml b/codecov.yml index ef5ea832..ac6e323a 100644 --- a/codecov.yml +++ b/codecov.yml @@ -12,6 +12,7 @@ fixes: ignore: - "**/test" - "test" + - "test/**/*" comment: layout: "diff, flags, files" behavior: default