Skip to content

Commit

Permalink
Update README regarding distribution branches (#80)
Browse files Browse the repository at this point in the history
* Update README regarding distribution branches

* Update ci using reusable_ici and indivirual badges

* Fix badges on detailed view

(cherry picked from commit 54039d4)
  • Loading branch information
fmauch committed Oct 5, 2023
1 parent 6ad3bd8 commit 668e57c
Show file tree
Hide file tree
Showing 11 changed files with 170 additions and 242 deletions.
59 changes: 0 additions & 59 deletions .github/workflows/binary-galactic.yml

This file was deleted.

57 changes: 0 additions & 57 deletions .github/workflows/binary-humble.yml

This file was deleted.

61 changes: 0 additions & 61 deletions .github/workflows/binary-iron.yml

This file was deleted.

57 changes: 0 additions & 57 deletions .github/workflows/binary-rolling.yml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/ci-ros-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ on:
jobs:
ament_lint:
name: ament_${{ matrix.linter }}
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
linter: [copyright, lint_cmake]
steps:
- uses: actions/checkout@v1
- uses: ros-tooling/setup-ros@v0.2
- uses: actions/checkout@v3
- uses: ros-tooling/setup-ros@v0.6
- uses: ros-tooling/[email protected]
with:
distribution: rolling
Expand Down
21 changes: 21 additions & 0 deletions .github/workflows/humble-binary-main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Humble Binary Build Main
on:
workflow_dispatch:
branches:
- humble
pull_request:
branches:
- humble
push:
branches:
- humble
schedule:
- cron: '53 5 * * *'

jobs:
binary:
uses: ./.github/workflows/reusable_ici.yml
with:
ros_distro: humble
ros_repo: main
ref_for_scheduled_build: humble
21 changes: 21 additions & 0 deletions .github/workflows/humble-binary-testing.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Humble Binary Build Testing
on:
workflow_dispatch:
branches:
- humble
pull_request:
branches:
- humble
push:
branches:
- humble
schedule:
- cron: '53 5 * * *'

jobs:
binary:
uses: ./.github/workflows/reusable_ici.yml
with:
ros_distro: humble
ros_repo: testing
ref_for_scheduled_build: humble
2 changes: 1 addition & 1 deletion .github/workflows/prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ROS_DISTRO: [humble, rolling]
ROS_DISTRO: [humble]
ROS_REPO: [main]
PRERELEASE: [true]
env:
Expand Down
53 changes: 53 additions & 0 deletions .github/workflows/reusable_ici.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: Reusable industrial_ci workflow
# original author: Denis Štogl <[email protected]>

on:
workflow_call:
inputs:
ref_for_scheduled_build:
description: 'Reference on which the repo should be checkout for scheduled build. Usually is this name of a branch or a tag.'
default: ''
required: false
type: string

upstream_workspace:
description: 'UPSTREAM_WORKSPACE variable for industrial_ci. Usually path to local .repos file.'
required: true
type: string
ros_distro:
description: 'ROS_DISTRO variable for industrial_ci'
required: true
type: string
ros_repo:
description: 'ROS_REPO to run for industrial_ci. Possible values: "main", "testing"'
default: 'main'
required: false
type: string
before_install_upstream_dependencies:
description: 'BEFORE_INSTALL_UPSTREAM_DEPENDENCIES variable for industrial_ci'
default: ''
required: false
type: string

jobs:
reusable_ici:
name: ${{ inputs.ros_distro }} ${{ inputs.ros_repo }} ${{ inputs.os_code_name }}
runs-on: ubuntu-latest
env:
DOCKER_RUN_OPTS: '-v /var/run/docker.sock:/var/run/docker.sock --network ursim_net'
steps:
- name: Checkout ${{ inputs.ref }} when build is not scheduled
if: ${{ github.event_name != 'schedule' }}
uses: actions/checkout@v3
- name: Checkout ${{ inputs.ref }} on scheduled build
if: ${{ github.event_name == 'schedule' }}
uses: actions/checkout@v3
with:
ref: ${{ inputs.ref_for_scheduled_build }}
- run: docker network create --subnet=192.168.56.0/24 ursim_net
- uses: 'ros-industrial/industrial_ci@master'
env:
UPSTREAM_WORKSPACE: ${{ inputs.upstream_workspace }}
ROS_DISTRO: ${{ inputs.ros_distro }}
ROS_REPO: ${{ inputs.ros_repo }}
CMAKE_ARGS: -DUR_ROBOT_DRIVER_BUILD_INTEGRATION_TESTS=ON
11 changes: 7 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,13 @@ This repository contains description files and meshes for *Universal Robots* man

ROS2 Distro | Branch | Build status | Released packages
:---------: | :----: | :----------: | :---------------:
**Galactic** | [`galactic`](https://github.com/UniversalRobots/Universal_Robots_ROS2_Description/tree/galactic) | [![Galactic Binary Build](https://github.com/UniversalRobots/Universal_Robots_ROS2_Description/actions/workflows/binary-galactic.yml/badge.svg?branch=galactic)](https://github.com/UniversalRobots/Universal_Robots_ROS2_Description/actions/workflows/binary-galactic.yml?branch=galactic) <br /> | [ur_description](https://index.ros.org/p/ur_description/#galactic)
**Humble** | [`ros2`](https://github.com/UniversalRobots/Universal_Robots_ROS2_Description/tree/ros2) | [![Humble Binary Build](https://github.com/UniversalRobots/Universal_Robots_ROS2_Description/actions/workflows/binary-humble.yml/badge.svg?branch=ros2)](https://github.com/UniversalRobots/Universal_Robots_ROS2_Description/actions/workflows/binary-humble.yml?branch=ros2) <br /> | [ur_description](https://index.ros.org/p/ur_description/#humble)
**Iron** | [`ros2`](https://github.com/UniversalRobots/Universal_Robots_ROS2_Description/tree/ros2) | [![Iron Binary Build](https://github.com/UniversalRobots/Universal_Robots_ROS2_Description/actions/workflows/binary-iron.yml/badge.svg?branch=ros2)](https://github.com/UniversalRobots/Universal_Robots_ROS2_Description/actions/workflows/binary-iron.yml?branch=ros2) <br /> | [ur_description](https://index.ros.org/p/ur_description/#iron)
**Rolling** | [`ros2`](https://github.com/UniversalRobots/Universal_Robots_ROS2_Description/tree/ros2) | [![Rolling Binary Build](https://github.com/UniversalRobots/Universal_Robots_ROS2_Description/actions/workflows/binary-rolling.yml/badge.svg?branch=ros2)](https://github.com/UniversalRobots/Universal_Robots_ROS2_Description/actions/workflows/binary-rolling.yml?branch=ros2) <br /> | [ur_description](https://index.ros.org/p/ur_description/#rolling)
**Humble** | [`humble`](https://github.com/UniversalRobots/Universal_Robots_ROS2_Description/tree/humble) | [![Build Status](https://build.ros2.org/job/Hbin_uJ64__ur_description__ubuntu_jammy_amd64__binary/badge/icon)](https://build.ros2.org/job/Hbin_uJ64__ur_description__ubuntu_jammy_amd64__binary/) | [ur_description](https://index.ros.org/p/ur_description/#humble)
**Iron** | [`iron`](https://github.com/UniversalRobots/Universal_Robots_ROS2_Description/tree/iron) | [![Build Status](https://build.ros2.org/job/Ibin_uJ64__ur_description__ubuntu_jammy_amd64__binary/badge/icon)](https://build.ros2.org/job/Ibin_uJ64__ur_description__ubuntu_jammy_amd64__binary/) | [ur_description](https://index.ros.org/p/ur_description/#iron)
**Rolling** | [`rolling`](https://github.com/UniversalRobots/Universal_Robots_ROS2_Description/tree/rolling) | [![Build Status](https://build.ros2.org/job/Rbin_uJ64__ur_description__ubuntu_jammy_amd64__binary/badge/icon)](https://build.ros2.org/job/Rbin_uJ64__ur_description__ubuntu_jammy_amd64__binary/)| [ur_description](https://index.ros.org/p/ur_description/#rolling)

A more [detailed build status](ci_status.md) shows the state of all CI workflows inside this repo.
Please note that the detailed view is intended for developers, while the one here should give end
users an overview of the current released state.


Note that for ROS2 **Foxy** the description is in the [driver's
Expand Down
Loading

0 comments on commit 668e57c

Please sign in to comment.