From 62d81cdc442a209675ba5e9aac9881f209d6533e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Wed, 8 May 2024 14:27:13 +0200 Subject: [PATCH] [CI] Specify runner/container images and add Jazzy jobs (#200) * Specify runner/container images * Add jazzy jobs * Add ABI compatibility check * Add jazzy repos files * Update upstream pre-commit wf * Update coverage build inputs --- .github/workflows/abi-compatibility.yml | 22 ++++++++++++++++++++ .github/workflows/build-binary.yml | 2 +- .github/workflows/build-source.yml | 16 +++++++++++++- .github/workflows/ci-pre-commit.yml | 2 +- .github/workflows/debian-build.yml | 2 +- .github/workflows/rhel-semi-binary-build.yml | 2 +- README.md | 1 + control_toolbox-not-released.jazzy.repos | 6 ++++++ control_toolbox.jazzy.repos | 9 ++++++++ 9 files changed, 57 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/abi-compatibility.yml create mode 100644 control_toolbox-not-released.jazzy.repos create mode 100644 control_toolbox.jazzy.repos diff --git a/.github/workflows/abi-compatibility.yml b/.github/workflows/abi-compatibility.yml new file mode 100644 index 0000000..a571966 --- /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 diff --git a/.github/workflows/build-binary.yml b/.github/workflows/build-binary.yml index 657a179..c6df887 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 662a333..7033cea 100644 --- a/.github/workflows/build-source.yml +++ b/.github/workflows/build-source.yml @@ -14,8 +14,22 @@ 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: jazzy + CONTAINER: ubuntu:24.04 + OS_NAME: ubuntu-latest + - 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 }} + 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 676f1f4..2288ed5 100644 --- a/.github/workflows/ci-pre-commit.yml +++ b/.github/workflows/ci-pre-commit.yml @@ -10,6 +10,6 @@ jobs: strategy: fail-fast: false matrix: - ROS_DISTRO: [rolling, iron, humble] + ROS_DISTRO: [humble, iron, jazzy, rolling] with: ros_distro: ${{ matrix.ROS_DISTRO }} diff --git a/.github/workflows/debian-build.yml b/.github/workflows/debian-build.yml index ff3e5f6..c768c33 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 ce84552..ebf05ed 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 1d0e3a4..352f3e4 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,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) diff --git a/control_toolbox-not-released.jazzy.repos b/control_toolbox-not-released.jazzy.repos new file mode 100644 index 0000000..1b3910e --- /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 0000000..f8ef4ec --- /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