From f669bc41f99b863284c31b96cdaf4d848262cf45 Mon Sep 17 00:00:00 2001 From: mhubii Date: Sun, 8 Sep 2024 18:54:53 +0200 Subject: [PATCH 1/3] separated individual workflow builds (https://github.com/lbr-stack/lbr_stack_doc/issues/27) --- .../workflows/build-ubuntu-22.04-fri-1.11.yml | 15 +++++++++++++ .../workflows/build-ubuntu-22.04-fri-1.14.yml | 15 +++++++++++++ .../workflows/build-ubuntu-22.04-fri-1.15.yml | 15 +++++++++++++ .../workflows/build-ubuntu-22.04-fri-1.16.yml | 15 +++++++++++++ .../workflows/build-ubuntu-22.04-fri-2.5.yml | 15 +++++++++++++ .../workflows/build-ubuntu-22.04-fri-2.7.yml | 15 +++++++++++++ .github/workflows/build.yml | 22 +++++++++---------- 7 files changed, 100 insertions(+), 12 deletions(-) create mode 100644 .github/workflows/build-ubuntu-22.04-fri-1.11.yml create mode 100644 .github/workflows/build-ubuntu-22.04-fri-1.14.yml create mode 100644 .github/workflows/build-ubuntu-22.04-fri-1.15.yml create mode 100644 .github/workflows/build-ubuntu-22.04-fri-1.16.yml create mode 100644 .github/workflows/build-ubuntu-22.04-fri-2.5.yml create mode 100644 .github/workflows/build-ubuntu-22.04-fri-2.7.yml diff --git a/.github/workflows/build-ubuntu-22.04-fri-1.11.yml b/.github/workflows/build-ubuntu-22.04-fri-1.11.yml new file mode 100644 index 00000000..1f105d60 --- /dev/null +++ b/.github/workflows/build-ubuntu-22.04-fri-1.11.yml @@ -0,0 +1,15 @@ +name: build-ubuntu-22.04-fri-1.11 +on: + pull_request: + branches: + - humble + workflow_dispatch: + schedule: + - cron: "0 0 * * 0" + +jobs: + build: + uses: ./.github/workflows/build.yml + with: + os: ubuntu-22.04 + fri_version: 1.11 diff --git a/.github/workflows/build-ubuntu-22.04-fri-1.14.yml b/.github/workflows/build-ubuntu-22.04-fri-1.14.yml new file mode 100644 index 00000000..0dbb74c9 --- /dev/null +++ b/.github/workflows/build-ubuntu-22.04-fri-1.14.yml @@ -0,0 +1,15 @@ +name: build-ubuntu-22.04-fri-1.14 +on: + pull_request: + branches: + - humble + workflow_dispatch: + schedule: + - cron: "0 0 * * 0" + +jobs: + build: + uses: ./.github/workflows/build.yml + with: + os: ubuntu-22.04 + fri_version: 1.14 diff --git a/.github/workflows/build-ubuntu-22.04-fri-1.15.yml b/.github/workflows/build-ubuntu-22.04-fri-1.15.yml new file mode 100644 index 00000000..7842296c --- /dev/null +++ b/.github/workflows/build-ubuntu-22.04-fri-1.15.yml @@ -0,0 +1,15 @@ +name: build-ubuntu-22.04-fri-1.15 +on: + pull_request: + branches: + - humble + workflow_dispatch: + schedule: + - cron: "0 0 * * 0" + +jobs: + build: + uses: ./.github/workflows/build.yml + with: + os: ubuntu-22.04 + fri_version: 1.15 diff --git a/.github/workflows/build-ubuntu-22.04-fri-1.16.yml b/.github/workflows/build-ubuntu-22.04-fri-1.16.yml new file mode 100644 index 00000000..2d45ee57 --- /dev/null +++ b/.github/workflows/build-ubuntu-22.04-fri-1.16.yml @@ -0,0 +1,15 @@ +name: build-ubuntu-22.04-fri-1.16 +on: + pull_request: + branches: + - humble + workflow_dispatch: + schedule: + - cron: "0 0 * * 0" + +jobs: + build: + uses: ./.github/workflows/build.yml + with: + os: ubuntu-22.04 + fri_version: 1.16 diff --git a/.github/workflows/build-ubuntu-22.04-fri-2.5.yml b/.github/workflows/build-ubuntu-22.04-fri-2.5.yml new file mode 100644 index 00000000..de3e3a82 --- /dev/null +++ b/.github/workflows/build-ubuntu-22.04-fri-2.5.yml @@ -0,0 +1,15 @@ +name: build-ubuntu-22.04-fri-2.5 +on: + pull_request: + branches: + - humble + workflow_dispatch: + schedule: + - cron: "0 0 * * 0" + +jobs: + build: + uses: ./.github/workflows/build.yml + with: + os: ubuntu-22.04 + fri_version: 2.5 diff --git a/.github/workflows/build-ubuntu-22.04-fri-2.7.yml b/.github/workflows/build-ubuntu-22.04-fri-2.7.yml new file mode 100644 index 00000000..71c65ae1 --- /dev/null +++ b/.github/workflows/build-ubuntu-22.04-fri-2.7.yml @@ -0,0 +1,15 @@ +name: build-ubuntu-22.04-fri-2.7 +on: + pull_request: + branches: + - humble + workflow_dispatch: + schedule: + - cron: "0 0 * * 0" + +jobs: + build: + uses: ./.github/workflows/build.yml + with: + os: ubuntu-22.04 + fri_version: 2.7 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f7ee2171..ea5e4e11 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,26 +1,24 @@ name: Build on: - pull_request: - branches: - - humble - workflow_dispatch: - schedule: - - cron: "0 0 * * 0" + workflow_call: # https://github.com/orgs/community/discussions/52616#discussioncomment-9364532 + inputs: + os: + required: true + type: string + fri_version: + required: true + type: string # ros 2 ci: https://github.com/marketplace/actions/ros-2-ci-action # doc: https://ubuntu.com/blog/ros-2-ci-with-github-actions jobs: build: - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-22.04] - fri_version: [1.11, 1.14, 1.15, 1.16, 2.5, 2.7] + runs-on: ${{ inputs.os }} steps: - uses: ros-tooling/setup-ros@v0.7 - uses: ros-tooling/action-ros-ci@v0.2 with: package-name: lbr_fri_ros2_stack target-ros2-distro: humble - vcs-repo-file-url: https://raw.githubusercontent.com/lbr-stack/lbr_fri_ros2_stack/humble/lbr_fri_ros2_stack/repos-fri-${{ matrix.fri_version }}.yaml + vcs-repo-file-url: https://raw.githubusercontent.com/lbr-stack/lbr_fri_ros2_stack/humble/lbr_fri_ros2_stack/repos-fri-${{ inputs.fri_version }}.yaml From 4fe934f12e19a4cd32f6eae34fa12e75720b692a Mon Sep 17 00:00:00 2001 From: mhubii Date: Sun, 8 Sep 2024 19:05:31 +0200 Subject: [PATCH 2/3] added individual status badges (https://github.com/lbr-stack/lbr_stack_doc/issues/27) --- README.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b9cbd2d4..e9df5dbe 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ # lbr_fri_ros2_stack -[![Build status](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build.yml/badge.svg?branch=humble)](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions) [![License](https://img.shields.io/github/license/lbr-stack/lbr_fri_ros2_stack)](https://github.com/lbr-stack/lbr_fri_ros2_stack/tree/humble?tab=Apache-2.0-1-ov-file#readme) [![Documentation Status](https://readthedocs.org/projects/lbr-stack/badge/?version=latest)](https://lbr-stack.readthedocs.io/en/latest/?badge=latest) [![JOSS](https://joss.theoj.org/papers/c43c82bed833c02503dd47f2637192ef/status.svg)](https://joss.theoj.org/papers/c43c82bed833c02503dd47f2637192ef) @@ -24,6 +23,16 @@ ROS 2 packages for the KUKA LBR, including communication to the real robot via t +## Status +| OS | ROS Distribution | FRI Version | Build Status | +| -------------- | ---------------- | ----------- | ------------ | +| `Ubuntu-22.04` | `humble` | `1.11` | [![build-ubuntu-22.04-fri-1.11](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-22.04-fri-1.11.yml/badge.svg)](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-22.04-fri-1.11.yml) | +| `Ubuntu-22.04` | `humble` | `1.14` | [![build-ubuntu-22.04-fri-1.14](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-22.04-fri-1.14.yml/badge.svg)](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-22.04-fri-1.14.yml) | +| `Ubuntu-22.04` | `humble` | `1.15` | [![build-ubuntu-22.04-fri-1.15](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-22.04-fri-1.15.yml/badge.svg)](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-22.04-fri-1.15.yml) | +| `Ubuntu-22.04` | `humble` | `1.16` | [![build-ubuntu-22.04-fri-1.16](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-22.04-fri-1.16.yml/badge.svg)](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-22.04-fri-1.16.yml) | +| `Ubuntu-22.04` | `humble` | `2.5` | [![build-ubuntu-22.04-fri-2.5](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-22.04-fri-2.5.yml/badge.svg)](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-22.04-fri-2.5.yml) | +| `Ubuntu-22.04` | `humble` | `2.7` | [![build-ubuntu-22.04-fri-2.7](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-22.04-fri-2.7.yml/badge.svg)](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-22.04-fri-2.7.yml) | + ## Documentation Full documentation available on [Read the Docs](https://lbr-stack.readthedocs.io/en/latest). From 1ca133b7605a6c8be36865dd54b04a5d9f12f11d Mon Sep 17 00:00:00 2001 From: mhubii Date: Sun, 8 Sep 2024 19:07:24 +0200 Subject: [PATCH 3/3] left aligned table --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e9df5dbe..ba546466 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ ROS 2 packages for the KUKA LBR, including communication to the real robot via t ## Status | OS | ROS Distribution | FRI Version | Build Status | -| -------------- | ---------------- | ----------- | ------------ | +| :------------- | :--------------- | :---------- | :----------- | | `Ubuntu-22.04` | `humble` | `1.11` | [![build-ubuntu-22.04-fri-1.11](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-22.04-fri-1.11.yml/badge.svg)](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-22.04-fri-1.11.yml) | | `Ubuntu-22.04` | `humble` | `1.14` | [![build-ubuntu-22.04-fri-1.14](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-22.04-fri-1.14.yml/badge.svg)](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-22.04-fri-1.14.yml) | | `Ubuntu-22.04` | `humble` | `1.15` | [![build-ubuntu-22.04-fri-1.15](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-22.04-fri-1.15.yml/badge.svg)](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-22.04-fri-1.15.yml) |