From e0965c61d7f74a05ba3960e8262c690a4410b0a1 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Wed, 24 Apr 2024 19:17:25 +0000 Subject: [PATCH 01/16] Use matrix strategy --- .github/workflows/ci-pre-commit.yml | 20 ++++++++++++-------- .github/workflows/source-build.yml | 25 ++++++++++++------------- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci-pre-commit.yml b/.github/workflows/ci-pre-commit.yml index adb6694b..f1ccd045 100644 --- a/.github/workflows/ci-pre-commit.yml +++ b/.github/workflows/ci-pre-commit.yml @@ -12,13 +12,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 }} diff --git a/.github/workflows/source-build.yml b/.github/workflows/source-build.yml index 0ec32c79..4f062ab2 100644 --- a/.github/workflows/source-build.yml +++ b/.github/workflows/source-build.yml @@ -14,20 +14,19 @@ 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 }} ref: master ros2_repo_branch: ${{ matrix.ROS_DISTRO }} - os_name: ubuntu-22.04 - source-rolling: - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-source-build.yml@master - strategy: - fail-fast: false - matrix: - ROS_DISTRO: [rolling] - with: - ros_distro: ${{ matrix.ROS_DISTRO }} - ref: master - ros2_repo_branch: ${{ matrix.ROS_DISTRO }} - container: ubuntu:24.04 + os_name: ${{ matrix.OS_NAME }} + container: ${{ matrix.CONTAINER }} From fa3f062310b2e21add1b5c2df110c5f924c2618f Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Thu, 25 Apr 2024 13:21:37 +0000 Subject: [PATCH 02/16] Add jazzy jobs --- .github/workflows/abi-compatibility.yml | 2 +- .github/workflows/binary-build.yml | 2 +- .github/workflows/ci-pre-commit.yml | 3 +++ .github/workflows/semi-binary-build.yml | 2 +- .github/workflows/source-build.yml | 3 +++ 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/abi-compatibility.yml b/.github/workflows/abi-compatibility.yml index 97f168c7..9ef96406 100644 --- a/.github/workflows/abi-compatibility.yml +++ b/.github/workflows/abi-compatibility.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false matrix: - ROS_DISTRO: [rolling, iron, humble] + ROS_DISTRO: [rolling, jazzy, iron, humble] steps: - uses: actions/checkout@v4 - uses: ros-industrial/industrial_ci@master diff --git a/.github/workflows/binary-build.yml b/.github/workflows/binary-build.yml index 317ed943..20ed75b9 100644 --- a/.github/workflows/binary-build.yml +++ b/.github/workflows/binary-build.yml @@ -20,7 +20,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/ci-pre-commit.yml b/.github/workflows/ci-pre-commit.yml index f1ccd045..7af7d043 100644 --- a/.github/workflows/ci-pre-commit.yml +++ b/.github/workflows/ci-pre-commit.yml @@ -19,6 +19,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/semi-binary-build.yml b/.github/workflows/semi-binary-build.yml index 532ff9e2..8c48ee67 100644 --- a/.github/workflows/semi-binary-build.yml +++ b/.github/workflows/semi-binary-build.yml @@ -19,7 +19,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/source-build.yml b/.github/workflows/source-build.yml index 4f062ab2..95985948 100644 --- a/.github/workflows/source-build.yml +++ b/.github/workflows/source-build.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 From 9b55a7b02711a952bbe81698cc1e87b46d2ac0a1 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Thu, 25 Apr 2024 13:36:44 +0000 Subject: [PATCH 03/16] Try jazzy branch for ICI --- .github/workflows/abi-compatibility.yml | 2 +- .github/workflows/binary-build.yml | 2 +- .github/workflows/semi-binary-build.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/abi-compatibility.yml b/.github/workflows/abi-compatibility.yml index 9ef96406..21185716 100644 --- a/.github/workflows/abi-compatibility.yml +++ b/.github/workflows/abi-compatibility.yml @@ -14,7 +14,7 @@ jobs: ROS_DISTRO: [rolling, jazzy, iron, humble] steps: - uses: actions/checkout@v4 - - uses: ros-industrial/industrial_ci@master + - uses: 'christophfroehlich/industrial_ci@add_jazzy' env: ROS_DISTRO: ${{ matrix.ROS_DISTRO }} ROS_REPO: main diff --git a/.github/workflows/binary-build.yml b/.github/workflows/binary-build.yml index 20ed75b9..dd43caf4 100644 --- a/.github/workflows/binary-build.yml +++ b/.github/workflows/binary-build.yml @@ -16,7 +16,7 @@ on: jobs: binary: - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@jazzy strategy: fail-fast: false matrix: diff --git a/.github/workflows/semi-binary-build.yml b/.github/workflows/semi-binary-build.yml index 8c48ee67..7f2eb361 100644 --- a/.github/workflows/semi-binary-build.yml +++ b/.github/workflows/semi-binary-build.yml @@ -15,7 +15,7 @@ on: jobs: semi_binary: - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@jazzy strategy: fail-fast: false matrix: From d7cc704800565f0774c817e69b4dbd1e9120273c Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Thu, 25 Apr 2024 13:39:41 +0000 Subject: [PATCH 04/16] Add repos file for jazzy --- realtime_tools-not-released.jazzy.repos | 6 ++++++ realtime_tools.jazzy.repos | 6 ++++++ 2 files changed, 12 insertions(+) create mode 100644 realtime_tools-not-released.jazzy.repos create mode 100644 realtime_tools.jazzy.repos diff --git a/realtime_tools-not-released.jazzy.repos b/realtime_tools-not-released.jazzy.repos new file mode 100644 index 00000000..1b3910e7 --- /dev/null +++ b/realtime_tools-not-released.jazzy.repos @@ -0,0 +1,6 @@ +repositories: + ## EXAMPLE DEPENDENCY +# : +# type: git +# url: git@github.com:/.git +# version: master diff --git a/realtime_tools.jazzy.repos b/realtime_tools.jazzy.repos new file mode 100644 index 00000000..1b3910e7 --- /dev/null +++ b/realtime_tools.jazzy.repos @@ -0,0 +1,6 @@ +repositories: + ## EXAMPLE DEPENDENCY +# : +# type: git +# url: git@github.com:/.git +# version: master From 0eb1c5d93da401f3e9fa72acc931a1edaee9ccc6 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Thu, 25 Apr 2024 14:07:40 +0000 Subject: [PATCH 05/16] Add jazzy to readme --- .github/workflows/README.md | 2 +- README.md | 13 ++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/.github/workflows/README.md b/.github/workflows/README.md index 148ccb0d..6507e068 100644 --- a/.github/workflows/README.md +++ b/.github/workflows/README.md @@ -2,7 +2,7 @@ ROS2 Distro | Branch | Build status | Documentation | Released packages :---------: | :----: | :----------: | :-----------: | :---------------: -**Rolling**
**Iron**
**Humble** | [`rolling`](https://github.com/ros-controls/realtime_tools/tree/rolling) | [![Rolling Binary Build](https://github.com/ros-controls/realtime_tools/actions/workflows/binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/realtime_tools/actions/workflows/binary-build.yml?branch=master)
[![Rolling Semi-Binary Build](https://github.com/ros-controls/realtime_tools/actions/workflows/semi-binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/realtime_tools/actions/workflows/semi-binary-build.yml?branch=master)
[![Rolling Source Build](https://github.com/ros-controls/realtime_tools/actions/workflows/source-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/realtime_tools/actions/workflows/source-build.yml?branch=master) | [API](http://docs.ros.org/en/rolling/p/realtime_tools/) | [realtime_tools](https://index.ros.org/p/realtime_tools/#rolling) +**Rolling**
**Jazzy**
**Iron**
**Humble** | [`master`](https://github.com/ros-controls/realtime_tools/tree/master) | [![Binary Build](https://github.com/ros-controls/realtime_tools/actions/workflows/binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/realtime_tools/actions/workflows/binary-build.yml?branch=master)
[![Semi-Binary Build](https://github.com/ros-controls/realtime_tools/actions/workflows/semi-binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/realtime_tools/actions/workflows/semi-binary-build.yml?branch=master)
[![Source Build](https://github.com/ros-controls/realtime_tools/actions/workflows/source-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/realtime_tools/actions/workflows/source-build.yml?branch=master) | [API](http://docs.ros.org/en/rolling/p/realtime_tools/) | [realtime_tools](https://index.ros.org/p/realtime_tools/#rolling) diff --git a/README.md b/README.md index 1c0a65f7..729db5ba 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,8 @@ Contains a set of tools that can be used from a hard realtime thread, without br ## Build status ROS2 Distro | Branch | Build status | Documentation | Released packages :---------: | :----: | :----------: | :-----------: | :---------------: -**Rolling** | [`master`](https://github.com/ros-controls/realtime_tools/tree/master) | [![Rolling Binary Build](https://github.com/ros-controls/realtime_tools/actions/workflows/binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/realtime_tools/actions/workflows/binary-build.yml?branch=master)
[![Rolling Semi-Binary Build](https://github.com/ros-controls/realtime_tools/actions/workflows/semi-binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/realtime_tools/actions/workflows/semi-binary-build.yml?branch=master) | [API](http://docs.ros.org/en/rolling/p/realtime_tools/) | [realtime_tools](https://index.ros.org/p/realtime_tools/#rolling) +**Rolling** | [`master`](https://github.com/ros-controls/realtime_tools/tree/master) | [![Binary Build](https://github.com/ros-controls/realtime_tools/actions/workflows/binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/realtime_tools/actions/workflows/binary-build.yml?branch=master)
[![Semi-Binary Build](https://github.com/ros-controls/realtime_tools/actions/workflows/semi-binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/realtime_tools/actions/workflows/semi-binary-build.yml?branch=master) | [API](http://docs.ros.org/en/rolling/p/realtime_tools/) | [realtime_tools](https://index.ros.org/p/realtime_tools/#rolling) +**Jazzy** | [`master`](https://github.com/ros-controls/realtime_tools/tree/master) | see above | [API](http://docs.ros.org/en/jazzy/p/realtime_tools/) | [realtime_tools](https://index.ros.org/p/realtime_tools/#jazzy) **Iron** | [`master`](https://github.com/ros-controls/realtime_tools/tree/master) | see above | [API](http://docs.ros.org/en/iron/p/realtime_tools/) | [realtime_tools](https://index.ros.org/p/realtime_tools/#iron) **Humble** | [`master`](https://github.com/ros-controls/realtime_tools/tree/master) | see above | [API](http://docs.ros.org/en/humble/p/realtime_tools/) | [realtime_tools](https://index.ros.org/p/realtime_tools/#humble) @@ -19,16 +20,6 @@ ROS2 Distro | Branch | Build status | Documentation | Released packages [Detailed build status](.github/workflows/README.md) -1. Binary builds - against released packages (main and testing) in ROS distributions. Shows that direct local build is possible. - - Uses repos file: `$NAME$-not-released..repos` - -1. Semi-binary builds - against released core ROS packages (main and testing), but the immediate dependencies are pulled from source. - Shows that local build with dependencies is possible and if fails there we can expect that after the next package sync we will not be able to build. - - Uses repos file: `$NAME$.repos` - - ## Publication If you find this work useful please give credits to the authors by citing: From bee35728899d68335567f28c527969f00b82c888 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Sun, 28 Apr 2024 21:17:50 +0000 Subject: [PATCH 06/16] Revert "Try jazzy branch for ICI" This reverts commit 9b55a7b02711a952bbe81698cc1e87b46d2ac0a1. --- .github/workflows/abi-compatibility.yml | 2 +- .github/workflows/binary-build.yml | 2 +- .github/workflows/semi-binary-build.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/abi-compatibility.yml b/.github/workflows/abi-compatibility.yml index 21185716..9ef96406 100644 --- a/.github/workflows/abi-compatibility.yml +++ b/.github/workflows/abi-compatibility.yml @@ -14,7 +14,7 @@ jobs: ROS_DISTRO: [rolling, jazzy, iron, humble] steps: - uses: actions/checkout@v4 - - uses: 'christophfroehlich/industrial_ci@add_jazzy' + - uses: ros-industrial/industrial_ci@master env: ROS_DISTRO: ${{ matrix.ROS_DISTRO }} ROS_REPO: main diff --git a/.github/workflows/binary-build.yml b/.github/workflows/binary-build.yml index dd43caf4..20ed75b9 100644 --- a/.github/workflows/binary-build.yml +++ b/.github/workflows/binary-build.yml @@ -16,7 +16,7 @@ on: jobs: binary: - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@jazzy + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master strategy: fail-fast: false matrix: diff --git a/.github/workflows/semi-binary-build.yml b/.github/workflows/semi-binary-build.yml index 7f2eb361..8c48ee67 100644 --- a/.github/workflows/semi-binary-build.yml +++ b/.github/workflows/semi-binary-build.yml @@ -15,7 +15,7 @@ on: jobs: semi_binary: - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@jazzy + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master strategy: fail-fast: false matrix: From 80f631b03a731a40afcaed644e7976806d979192 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Sun, 28 Apr 2024 21:18:48 +0000 Subject: [PATCH 07/16] Add jazzy for debian --- .github/workflows/debian-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/debian-build.yml b/.github/workflows/debian-build.yml index 741bd1c4..2ba39273 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, iron, jazzy, humble] with: ros_distro: ${{ matrix.ROS_DISTRO }} upstream_workspace: realtime_tools.${{ matrix.ROS_DISTRO }}.repos From cbe8dd6ffeec58eb3fd0164285ebbb9bbd90a47c Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Sun, 28 Apr 2024 21:42:28 +0000 Subject: [PATCH 08/16] Add RHEL jazzy workflow --- .github/workflows/rhel-semi-binary-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rhel-semi-binary-build.yml b/.github/workflows/rhel-semi-binary-build.yml index 6ec6399b..307a555f 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, iron, jazzy, humble] with: ros_distro: ${{ matrix.ROS_DISTRO }} upstream_workspace: realtime_tools.${{ matrix.ROS_DISTRO }}.repos From 75e86b849c5bb6f28dc5793344ffb5633253cef5 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Mon, 29 Apr 2024 06:06:05 +0000 Subject: [PATCH 09/16] Remove semi-binary job and empty repos files --- .github/workflows/README.md | 9 +------- .github/workflows/binary-build.yml | 1 - .github/workflows/semi-binary-build.yml | 28 ----------------------- README.md | 4 ++-- realtime_tools-not-released.humble.repos | 6 ----- realtime_tools-not-released.iron.repos | 6 ----- realtime_tools-not-released.jazzy.repos | 6 ----- realtime_tools-not-released.rolling.repos | 6 ----- realtime_tools.humble.repos | 6 ----- realtime_tools.iron.repos | 6 ----- realtime_tools.jazzy.repos | 6 ----- realtime_tools.rolling.repos | 6 ----- 12 files changed, 3 insertions(+), 87 deletions(-) delete mode 100644 .github/workflows/semi-binary-build.yml delete mode 100644 realtime_tools-not-released.humble.repos delete mode 100644 realtime_tools-not-released.iron.repos delete mode 100644 realtime_tools-not-released.jazzy.repos delete mode 100644 realtime_tools-not-released.rolling.repos delete mode 100644 realtime_tools.humble.repos delete mode 100644 realtime_tools.iron.repos delete mode 100644 realtime_tools.jazzy.repos delete mode 100644 realtime_tools.rolling.repos diff --git a/.github/workflows/README.md b/.github/workflows/README.md index 6507e068..57f5e83f 100644 --- a/.github/workflows/README.md +++ b/.github/workflows/README.md @@ -2,7 +2,7 @@ ROS2 Distro | Branch | Build status | Documentation | Released packages :---------: | :----: | :----------: | :-----------: | :---------------: -**Rolling**
**Jazzy**
**Iron**
**Humble** | [`master`](https://github.com/ros-controls/realtime_tools/tree/master) | [![Binary Build](https://github.com/ros-controls/realtime_tools/actions/workflows/binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/realtime_tools/actions/workflows/binary-build.yml?branch=master)
[![Semi-Binary Build](https://github.com/ros-controls/realtime_tools/actions/workflows/semi-binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/realtime_tools/actions/workflows/semi-binary-build.yml?branch=master)
[![Source Build](https://github.com/ros-controls/realtime_tools/actions/workflows/source-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/realtime_tools/actions/workflows/source-build.yml?branch=master) | [API](http://docs.ros.org/en/rolling/p/realtime_tools/) | [realtime_tools](https://index.ros.org/p/realtime_tools/#rolling) +**Rolling**
**Jazzy**
**Iron**
**Humble** | [`master`](https://github.com/ros-controls/realtime_tools/tree/master) | [![Binary Build](https://github.com/ros-controls/realtime_tools/actions/workflows/binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/realtime_tools/actions/workflows/binary-build.yml?branch=master)
[![Source Build](https://github.com/ros-controls/realtime_tools/actions/workflows/source-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/realtime_tools/actions/workflows/source-build.yml?branch=master) | [API](http://docs.ros.org/en/rolling/p/realtime_tools/) | [realtime_tools](https://index.ros.org/p/realtime_tools/#rolling) @@ -14,11 +14,4 @@ ROS2 Distro | Branch | Build status | Documentation | Released packages 1. Binary builds - against released packages (main and testing) in ROS distributions. Shows that direct local build is possible. - Uses repos file: `$NAME$-not-released..repos` - -1. Semi-binary builds - against released core ROS packages (main and testing), but the immediate dependencies are pulled from source. - Shows that local build with dependencies is possible and if fails there we can expect that after the next package sync we will not be able to build. - - Uses repos file: `$NAME$.repos` - 1. Source build - also core ROS packages are build from source. It shows potential issues in the mid future. diff --git a/.github/workflows/binary-build.yml b/.github/workflows/binary-build.yml index 20ed75b9..cf89a52b 100644 --- a/.github/workflows/binary-build.yml +++ b/.github/workflows/binary-build.yml @@ -25,5 +25,4 @@ jobs: with: ros_distro: ${{ matrix.ROS_DISTRO }} ros_repo: ${{ matrix.ROS_REPO }} - upstream_workspace: realtime_tools-not-released.${{ matrix.ROS_DISTRO }}.repos ref_for_scheduled_build: master diff --git a/.github/workflows/semi-binary-build.yml b/.github/workflows/semi-binary-build.yml deleted file mode 100644 index 8c48ee67..00000000 --- a/.github/workflows/semi-binary-build.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: Semi-Binary Build -# description: 'Build & test that compiles the main dependencies from source.' - -on: - workflow_dispatch: - pull_request: - branches: - - master - push: - branches: - - master - schedule: - # Run every morning to detect flakiness and broken dependencies - - cron: '33 1 * * *' - -jobs: - semi_binary: - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master - strategy: - fail-fast: false - matrix: - ROS_DISTRO: [rolling, jazzy, iron, humble] - ROS_REPO: [main, testing] - with: - ros_distro: ${{ matrix.ROS_DISTRO }} - ros_repo: ${{ matrix.ROS_REPO }} - upstream_workspace: realtime_tools.${{ matrix.ROS_DISTRO }}.repos - ref_for_scheduled_build: master diff --git a/README.md b/README.md index 729db5ba..4428aba8 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Contains a set of tools that can be used from a hard realtime thread, without br ## Build status ROS2 Distro | Branch | Build status | Documentation | Released packages :---------: | :----: | :----------: | :-----------: | :---------------: -**Rolling** | [`master`](https://github.com/ros-controls/realtime_tools/tree/master) | [![Binary Build](https://github.com/ros-controls/realtime_tools/actions/workflows/binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/realtime_tools/actions/workflows/binary-build.yml?branch=master)
[![Semi-Binary Build](https://github.com/ros-controls/realtime_tools/actions/workflows/semi-binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/realtime_tools/actions/workflows/semi-binary-build.yml?branch=master) | [API](http://docs.ros.org/en/rolling/p/realtime_tools/) | [realtime_tools](https://index.ros.org/p/realtime_tools/#rolling) +**Rolling** | [`master`](https://github.com/ros-controls/realtime_tools/tree/master) | [![Binary Build](https://github.com/ros-controls/realtime_tools/actions/workflows/binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/realtime_tools/actions/workflows/binary-build.yml?branch=master)
[![Source Build](https://github.com/ros-controls/realtime_tools/actions/workflows/source-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/realtime_tools/actions/workflows/source-build.yml?branch=master) | [API](http://docs.ros.org/en/rolling/p/realtime_tools/) | [realtime_tools](https://index.ros.org/p/realtime_tools/#rolling) **Jazzy** | [`master`](https://github.com/ros-controls/realtime_tools/tree/master) | see above | [API](http://docs.ros.org/en/jazzy/p/realtime_tools/) | [realtime_tools](https://index.ros.org/p/realtime_tools/#jazzy) **Iron** | [`master`](https://github.com/ros-controls/realtime_tools/tree/master) | see above | [API](http://docs.ros.org/en/iron/p/realtime_tools/) | [realtime_tools](https://index.ros.org/p/realtime_tools/#iron) **Humble** | [`master`](https://github.com/ros-controls/realtime_tools/tree/master) | see above | [API](http://docs.ros.org/en/humble/p/realtime_tools/) | [realtime_tools](https://index.ros.org/p/realtime_tools/#humble) @@ -16,7 +16,7 @@ ROS2 Distro | Branch | Build status | Documentation | Released packages ### Explanation of different build types -**NOTE**: There are three build stages checking current and future compatibility of the package. +**NOTE**: There are different build stages checking current and future compatibility of the package. [Detailed build status](.github/workflows/README.md) diff --git a/realtime_tools-not-released.humble.repos b/realtime_tools-not-released.humble.repos deleted file mode 100644 index 1b3910e7..00000000 --- a/realtime_tools-not-released.humble.repos +++ /dev/null @@ -1,6 +0,0 @@ -repositories: - ## EXAMPLE DEPENDENCY -# : -# type: git -# url: git@github.com:/.git -# version: master diff --git a/realtime_tools-not-released.iron.repos b/realtime_tools-not-released.iron.repos deleted file mode 100644 index 1b3910e7..00000000 --- a/realtime_tools-not-released.iron.repos +++ /dev/null @@ -1,6 +0,0 @@ -repositories: - ## EXAMPLE DEPENDENCY -# : -# type: git -# url: git@github.com:/.git -# version: master diff --git a/realtime_tools-not-released.jazzy.repos b/realtime_tools-not-released.jazzy.repos deleted file mode 100644 index 1b3910e7..00000000 --- a/realtime_tools-not-released.jazzy.repos +++ /dev/null @@ -1,6 +0,0 @@ -repositories: - ## EXAMPLE DEPENDENCY -# : -# type: git -# url: git@github.com:/.git -# version: master diff --git a/realtime_tools-not-released.rolling.repos b/realtime_tools-not-released.rolling.repos deleted file mode 100644 index 1b3910e7..00000000 --- a/realtime_tools-not-released.rolling.repos +++ /dev/null @@ -1,6 +0,0 @@ -repositories: - ## EXAMPLE DEPENDENCY -# : -# type: git -# url: git@github.com:/.git -# version: master diff --git a/realtime_tools.humble.repos b/realtime_tools.humble.repos deleted file mode 100644 index 1b3910e7..00000000 --- a/realtime_tools.humble.repos +++ /dev/null @@ -1,6 +0,0 @@ -repositories: - ## EXAMPLE DEPENDENCY -# : -# type: git -# url: git@github.com:/.git -# version: master diff --git a/realtime_tools.iron.repos b/realtime_tools.iron.repos deleted file mode 100644 index 1b3910e7..00000000 --- a/realtime_tools.iron.repos +++ /dev/null @@ -1,6 +0,0 @@ -repositories: - ## EXAMPLE DEPENDENCY -# : -# type: git -# url: git@github.com:/.git -# version: master diff --git a/realtime_tools.jazzy.repos b/realtime_tools.jazzy.repos deleted file mode 100644 index 1b3910e7..00000000 --- a/realtime_tools.jazzy.repos +++ /dev/null @@ -1,6 +0,0 @@ -repositories: - ## EXAMPLE DEPENDENCY -# : -# type: git -# url: git@github.com:/.git -# version: master diff --git a/realtime_tools.rolling.repos b/realtime_tools.rolling.repos deleted file mode 100644 index 1b3910e7..00000000 --- a/realtime_tools.rolling.repos +++ /dev/null @@ -1,6 +0,0 @@ -repositories: - ## EXAMPLE DEPENDENCY -# : -# type: git -# url: git@github.com:/.git -# version: master From 6d51b3723a380bcb40e61e22d88ce4eb48351c31 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Mon, 29 Apr 2024 08:19:37 +0000 Subject: [PATCH 10/16] Fix rhel+debian --- .github/workflows/debian-build.yml | 1 - .github/workflows/rhel-semi-binary-build.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/debian-build.yml b/.github/workflows/debian-build.yml index 2ba39273..ea76d01f 100644 --- a/.github/workflows/debian-build.yml +++ b/.github/workflows/debian-build.yml @@ -18,5 +18,4 @@ jobs: ROS_DISTRO: [rolling, iron, jazzy, humble] with: ros_distro: ${{ matrix.ROS_DISTRO }} - upstream_workspace: realtime_tools.${{ matrix.ROS_DISTRO }}.repos ref_for_scheduled_build: master diff --git a/.github/workflows/rhel-semi-binary-build.yml b/.github/workflows/rhel-semi-binary-build.yml index 307a555f..e2f09a6e 100644 --- a/.github/workflows/rhel-semi-binary-build.yml +++ b/.github/workflows/rhel-semi-binary-build.yml @@ -18,5 +18,4 @@ jobs: ROS_DISTRO: [rolling, iron, jazzy, humble] with: ros_distro: ${{ matrix.ROS_DISTRO }} - upstream_workspace: realtime_tools.${{ matrix.ROS_DISTRO }}.repos ref_for_scheduled_build: master From eb3d20aa5dbb1f6dff1a2e03e5470d23d0ef6984 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Mon, 29 Apr 2024 12:06:52 +0000 Subject: [PATCH 11/16] Test coverage build without repos file --- .github/workflows/ci-coverage-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-coverage-build.yml b/.github/workflows/ci-coverage-build.yml index 2aa8606c..5b5b8620 100644 --- a/.github/workflows/ci-coverage-build.yml +++ b/.github/workflows/ci-coverage-build.yml @@ -11,7 +11,7 @@ on: jobs: coverage: name: coverage build - 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 df17566fd0ff391a2a04cc5b7e30747dc030c622 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Tue, 7 May 2024 19:00:11 +0200 Subject: [PATCH 12/16] Use master branch of ros2_control_ci repo --- .github/workflows/ci-coverage-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-coverage-build.yml b/.github/workflows/ci-coverage-build.yml index 5b5b8620..2aa8606c 100644 --- a/.github/workflows/ci-coverage-build.yml +++ b/.github/workflows/ci-coverage-build.yml @@ -11,7 +11,7 @@ on: jobs: coverage: name: coverage build - 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 bf6027f0828a0301c152ed3c11385bf1446c033a Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 7 May 2024 20:05:12 +0000 Subject: [PATCH 13/16] 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 7af7d043..0d886e70 100644 --- a/.github/workflows/ci-pre-commit.yml +++ b/.github/workflows/ci-pre-commit.yml @@ -12,20 +12,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 128e40c14e86b4234f21174268838221b4571baf Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 7 May 2024 20:25:38 +0000 Subject: [PATCH 14/16] Use ros: container for coverage build --- .github/workflows/ci-coverage-build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci-coverage-build.yml b/.github/workflows/ci-coverage-build.yml index 2aa8606c..cf1795d0 100644 --- a/.github/workflows/ci-coverage-build.yml +++ b/.github/workflows/ci-coverage-build.yml @@ -11,8 +11,7 @@ on: jobs: coverage: name: coverage build - 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@coverage_build secrets: inherit with: ros_distro: rolling - container: ubuntu:24.04 From 6641563c3992dd2409265af056dd1b3fea2615da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Wed, 8 May 2024 11:09:56 +0200 Subject: [PATCH 15/16] Use master branch of ros2_control_ci repo --- .github/workflows/ci-coverage-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-coverage-build.yml b/.github/workflows/ci-coverage-build.yml index cf1795d0..5a5cc611 100644 --- a/.github/workflows/ci-coverage-build.yml +++ b/.github/workflows/ci-coverage-build.yml @@ -11,7 +11,7 @@ on: jobs: coverage: name: coverage build - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@coverage_build + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@master secrets: inherit with: ros_distro: rolling From 05145a45eaaa69095a08effa11188fd1942ecf86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Thu, 9 May 2024 00:01:38 +0200 Subject: [PATCH 16/16] Sort the distros --- .github/workflows/abi-compatibility.yml | 2 +- .github/workflows/binary-build.yml | 2 +- .github/workflows/debian-build.yml | 2 +- .github/workflows/rhel-semi-binary-build.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/abi-compatibility.yml b/.github/workflows/abi-compatibility.yml index 9ef96406..b1207bbc 100644 --- a/.github/workflows/abi-compatibility.yml +++ b/.github/workflows/abi-compatibility.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false matrix: - ROS_DISTRO: [rolling, jazzy, iron, humble] + ROS_DISTRO: [humble, iron, jazzy, rolling] steps: - uses: actions/checkout@v4 - uses: ros-industrial/industrial_ci@master diff --git a/.github/workflows/binary-build.yml b/.github/workflows/binary-build.yml index cf89a52b..446acc62 100644 --- a/.github/workflows/binary-build.yml +++ b/.github/workflows/binary-build.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - ROS_DISTRO: [rolling, jazzy, iron, humble] + ROS_DISTRO: [humble, iron, jazzy, rolling] ROS_REPO: [main, testing] with: ros_distro: ${{ matrix.ROS_DISTRO }} diff --git a/.github/workflows/debian-build.yml b/.github/workflows/debian-build.yml index ea76d01f..c556287c 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, jazzy, humble] + ROS_DISTRO: [humble, iron, jazzy, rolling] with: ros_distro: ${{ matrix.ROS_DISTRO }} ref_for_scheduled_build: master diff --git a/.github/workflows/rhel-semi-binary-build.yml b/.github/workflows/rhel-semi-binary-build.yml index e2f09a6e..10f22ffe 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, jazzy, humble] + ROS_DISTRO: [humble, iron, jazzy, rolling] with: ros_distro: ${{ matrix.ROS_DISTRO }} ref_for_scheduled_build: master