From a3a5ac6debd5673ad6586c610ab80941989b6512 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Wed, 24 Apr 2024 13:18:07 +0000 Subject: [PATCH 1/9] Specify runner/container images --- .github/workflows/build-coverage.yml | 1 + .github/workflows/build-source.yml | 1 + .github/workflows/ci-pre-commit.yml | 9 ++++++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-coverage.yml b/.github/workflows/build-coverage.yml index 406a9295..27e2851f 100644 --- a/.github/workflows/build-coverage.yml +++ b/.github/workflows/build-coverage.yml @@ -15,3 +15,4 @@ jobs: secrets: inherit with: ros_distro: rolling + container: ubuntu:24.04 diff --git a/.github/workflows/build-source.yml b/.github/workflows/build-source.yml index 662a3338..203f8dbb 100644 --- a/.github/workflows/build-source.yml +++ b/.github/workflows/build-source.yml @@ -19,3 +19,4 @@ jobs: ros_distro: ${{ matrix.ROS_DISTRO }} ref: ros2-master ros2_repo_branch: ${{ matrix.ROS_DISTRO }} + container: ubuntu:24.04 diff --git a/.github/workflows/ci-pre-commit.yml b/.github/workflows/ci-pre-commit.yml index 676f1f46..05b1e12a 100644 --- a/.github/workflows/ci-pre-commit.yml +++ b/.github/workflows/ci-pre-commit.yml @@ -10,6 +10,13 @@ jobs: strategy: fail-fast: false matrix: - ROS_DISTRO: [rolling, iron, humble] + ROS_DISTRO: [iron, humble] with: ros_distro: ${{ matrix.ROS_DISTRO }} + os_name: ubuntu-22.04 + + pre-commit-rolling: + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master + with: + ros_distro: rolling + container: ubuntu:24.04 From c27cd0f048cbbd60923610cc40786250ee0525a2 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Wed, 24 Apr 2024 19:04:58 +0000 Subject: [PATCH 2/9] Use matrix strategy --- .github/workflows/build-source.yml | 14 ++++++++++++-- .github/workflows/ci-pre-commit.yml | 20 ++++++++++++-------- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-source.yml b/.github/workflows/build-source.yml index 203f8dbb..50b33e07 100644 --- a/.github/workflows/build-source.yml +++ b/.github/workflows/build-source.yml @@ -14,9 +14,19 @@ jobs: strategy: fail-fast: false matrix: - ROS_DISTRO: [rolling, iron, humble] + include: + - ROS_DISTRO: humble + CONTAINER: "" + OS_NAME: ubuntu-22.04 + - ROS_DISTRO: iron + CONTAINER: "" + OS_NAME: ubuntu-22.04 + - ROS_DISTRO: rolling + CONTAINER: ubuntu:24.04 + OS_NAME: ubuntu-latest with: ros_distro: ${{ matrix.ROS_DISTRO }} ref: ros2-master ros2_repo_branch: ${{ matrix.ROS_DISTRO }} - container: ubuntu:24.04 + os_name: ${{ matrix.OS_NAME }} + container: ${{ matrix.CONTAINER }} diff --git a/.github/workflows/ci-pre-commit.yml b/.github/workflows/ci-pre-commit.yml index 05b1e12a..ae9e8587 100644 --- a/.github/workflows/ci-pre-commit.yml +++ b/.github/workflows/ci-pre-commit.yml @@ -10,13 +10,17 @@ jobs: strategy: fail-fast: false matrix: - ROS_DISTRO: [iron, humble] + include: + - ROS_DISTRO: humble + CONTAINER: "" + OS_NAME: ubuntu-22.04 + - ROS_DISTRO: iron + CONTAINER: "" + OS_NAME: ubuntu-22.04 + - ROS_DISTRO: rolling + CONTAINER: ubuntu:24.04 + OS_NAME: ubuntu-latest with: ros_distro: ${{ matrix.ROS_DISTRO }} - os_name: ubuntu-22.04 - - pre-commit-rolling: - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master - with: - ros_distro: rolling - container: ubuntu:24.04 + os_name: ${{ matrix.OS_NAME }} + container: ${{ matrix.CONTAINER }} From cf8b6713db8055592695aa7cad1a62cc1d101972 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Sun, 28 Apr 2024 21:48:42 +0000 Subject: [PATCH 3/9] Add jazzy jobs --- .github/workflows/build-binary.yml | 2 +- .github/workflows/build-source.yml | 3 +++ .github/workflows/ci-pre-commit.yml | 3 +++ .github/workflows/debian-build.yml | 2 +- .github/workflows/rhel-semi-binary-build.yml | 2 +- README.md | 1 + 6 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-binary.yml b/.github/workflows/build-binary.yml index 657a1799..c6df8877 100644 --- a/.github/workflows/build-binary.yml +++ b/.github/workflows/build-binary.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - ROS_DISTRO: [rolling, iron, humble] + ROS_DISTRO: [rolling, jazzy, iron, humble] ROS_REPO: [main, testing] with: ros_distro: ${{ matrix.ROS_DISTRO }} diff --git a/.github/workflows/build-source.yml b/.github/workflows/build-source.yml index 50b33e07..7033cea8 100644 --- a/.github/workflows/build-source.yml +++ b/.github/workflows/build-source.yml @@ -21,6 +21,9 @@ jobs: - ROS_DISTRO: iron CONTAINER: "" OS_NAME: ubuntu-22.04 + - ROS_DISTRO: jazzy + CONTAINER: ubuntu:24.04 + OS_NAME: ubuntu-latest - ROS_DISTRO: rolling CONTAINER: ubuntu:24.04 OS_NAME: ubuntu-latest diff --git a/.github/workflows/ci-pre-commit.yml b/.github/workflows/ci-pre-commit.yml index ae9e8587..20387d26 100644 --- a/.github/workflows/ci-pre-commit.yml +++ b/.github/workflows/ci-pre-commit.yml @@ -17,6 +17,9 @@ jobs: - ROS_DISTRO: iron CONTAINER: "" OS_NAME: ubuntu-22.04 + - ROS_DISTRO: jazzy + CONTAINER: ubuntu:24.04 + OS_NAME: ubuntu-latest - ROS_DISTRO: rolling CONTAINER: ubuntu:24.04 OS_NAME: ubuntu-latest diff --git a/.github/workflows/debian-build.yml b/.github/workflows/debian-build.yml index ff3e5f66..c768c33d 100644 --- a/.github/workflows/debian-build.yml +++ b/.github/workflows/debian-build.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - ROS_DISTRO: [rolling, iron, humble] + ROS_DISTRO: [rolling, jazzy, iron, humble] with: ros_distro: ${{ matrix.ROS_DISTRO }} upstream_workspace: control_toolbox.${{ matrix.ROS_DISTRO }}.repos diff --git a/.github/workflows/rhel-semi-binary-build.yml b/.github/workflows/rhel-semi-binary-build.yml index ce84552f..ebf05edf 100644 --- a/.github/workflows/rhel-semi-binary-build.yml +++ b/.github/workflows/rhel-semi-binary-build.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - ROS_DISTRO: [rolling, iron, humble] + ROS_DISTRO: [rolling, jazzy, iron, humble] with: ros_distro: ${{ matrix.ROS_DISTRO }} upstream_workspace: control_toolbox.${{ matrix.ROS_DISTRO }}.repos diff --git a/README.md b/README.md index 846c4a7e..5e6880c3 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ See the documentation of [ros2_control](http://control.ros.org) and release info ROS2 Distro | Branch | Build status | Documentation | Released packages :---------: | :----: | :----------: | :-----------: | :---------------: **Rolling** | [`master`](https://github.com/ros-controls/control_toolbox/tree/master) | [![Binary Build](https://github.com/ros-controls/control_toolbox/actions/workflows/build-binary.yml/badge.svg?branch=ros2-master)](https://github.com/ros-controls/control_toolbox/actions/workflows/build-binary.yml?branch=ros2-master)
[![Rolling Source Build](https://github.com/ros-controls/control_toolbox/actions/workflows/build-source.yml/badge.svg?branch=ros2-master)](https://github.com/ros-controls/control_toolbox/actions/workflows/build-source.yml?branch=ros2-master) | [API](http://docs.ros.org/en/rolling/p/control_toolbox/) | [control_toolbox](https://index.ros.org/p/control_toolbox/#rolling) +**Jazzy** | [`master`](https://github.com/ros-controls/control_toolbox/tree/master) | see above | [API](http://docs.ros.org/en/jazzy/p/control_toolbox/) | [control_toolbox](https://index.ros.org/p/control_toolbox/#jazzy) **Iron** | [`master`](https://github.com/ros-controls/control_toolbox/tree/master) | see above | [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) | see above | [API](http://docs.ros.org/en/humble/p/control_toolbox/) | [control_toolbox](https://index.ros.org/p/control_toolbox/#humble) From 63bbca1d9585442d70ba315c7937bb09f08ea8ea Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Sun, 28 Apr 2024 21:53:26 +0000 Subject: [PATCH 4/9] Add ABI compatibility check --- .github/workflows/abi-compatibility.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/abi-compatibility.yml diff --git a/.github/workflows/abi-compatibility.yml b/.github/workflows/abi-compatibility.yml new file mode 100644 index 00000000..a5719664 --- /dev/null +++ b/.github/workflows/abi-compatibility.yml @@ -0,0 +1,22 @@ +name: ABI Compatibility Check +on: + workflow_dispatch: + pull_request: + branches: + - ros2-master + +jobs: + abi_check: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + ROS_DISTRO: [rolling, jazzy, iron, humble] + steps: + - uses: actions/checkout@v4 + - uses: ros-industrial/industrial_ci@master + env: + ROS_DISTRO: ${{ matrix.ROS_DISTRO }} + ROS_REPO: main + ABICHECK_URL: github:${{ github.repository }}#${{ github.base_ref }} + NOT_TEST_BUILD: true From 69874b1aef3fa6dbac3fbd59efc59a6e48ed447b Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Sun, 28 Apr 2024 21:54:30 +0000 Subject: [PATCH 5/9] Add jazzy repos files --- control_toolbox-not-released.jazzy.repos | 6 ++++++ control_toolbox.jazzy.repos | 9 +++++++++ 2 files changed, 15 insertions(+) create mode 100644 control_toolbox-not-released.jazzy.repos create mode 100644 control_toolbox.jazzy.repos diff --git a/control_toolbox-not-released.jazzy.repos b/control_toolbox-not-released.jazzy.repos new file mode 100644 index 00000000..1b3910e7 --- /dev/null +++ b/control_toolbox-not-released.jazzy.repos @@ -0,0 +1,6 @@ +repositories: + ## EXAMPLE DEPENDENCY +# : +# type: git +# url: git@github.com:/.git +# version: master diff --git a/control_toolbox.jazzy.repos b/control_toolbox.jazzy.repos new file mode 100644 index 00000000..f8ef4ecb --- /dev/null +++ b/control_toolbox.jazzy.repos @@ -0,0 +1,9 @@ +repositories: + control_msgs: + type: git + url: https://github.com/ros-controls/control_msgs.git + version: master + realtime_tools: + type: git + url: https://github.com/ros-controls/realtime_tools + version: master From c3c331f64f7fa94a2b3fd3fe2e8043c34c4d2dc7 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Mon, 29 Apr 2024 12:15:29 +0000 Subject: [PATCH 6/9] Test optional repos --- .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 27e2851f..51aa9e2b 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@optional_repos secrets: inherit with: ros_distro: rolling From 9f4b6b5a3b400c876463a021cafabc1c4d9a44b2 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Mon, 29 Apr 2024 12:29:16 +0000 Subject: [PATCH 7/9] Revert "Test optional repos" This reverts commit c3c331f64f7fa94a2b3fd3fe2e8043c34c4d2dc7. --- .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 51aa9e2b..27e2851f 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@optional_repos + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@master secrets: inherit with: ros_distro: rolling From 554cc9711c9240d62ada06f144a664b0ab7d0bab Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 7 May 2024 19:59:52 +0000 Subject: [PATCH 8/9] Update upstream pre-commit wf --- .github/workflows/ci-pre-commit.yml | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/.github/workflows/ci-pre-commit.yml b/.github/workflows/ci-pre-commit.yml index 20387d26..2288ed56 100644 --- a/.github/workflows/ci-pre-commit.yml +++ b/.github/workflows/ci-pre-commit.yml @@ -10,20 +10,6 @@ jobs: strategy: fail-fast: false matrix: - include: - - ROS_DISTRO: humble - CONTAINER: "" - OS_NAME: ubuntu-22.04 - - ROS_DISTRO: iron - CONTAINER: "" - OS_NAME: ubuntu-22.04 - - ROS_DISTRO: jazzy - CONTAINER: ubuntu:24.04 - OS_NAME: ubuntu-latest - - ROS_DISTRO: rolling - CONTAINER: ubuntu:24.04 - OS_NAME: ubuntu-latest + ROS_DISTRO: [humble, iron, jazzy, rolling] with: ros_distro: ${{ matrix.ROS_DISTRO }} - os_name: ${{ matrix.OS_NAME }} - container: ${{ matrix.CONTAINER }} From 978d18b5dd81c7ec6cebc6a8334fd983c378ad76 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Wed, 8 May 2024 09:08:44 +0000 Subject: [PATCH 9/9] Update coverage build inputs --- .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 27e2851f..406a9295 100644 --- a/.github/workflows/build-coverage.yml +++ b/.github/workflows/build-coverage.yml @@ -15,4 +15,3 @@ jobs: secrets: inherit with: ros_distro: rolling - container: ubuntu:24.04