Skip to content

Commit dc37852

Browse files
mergify[bot]Felix Exner (fexner)
andauthored
Update README regarding distribution branches (#80) (#86)
* Update README regarding distribution branches * Update ci using reusable_ici and indivirual badges * Fix badges on detailed view (cherry picked from commit 54039d4) Co-authored-by: Felix Exner (fexner) <[email protected]>
1 parent 6ad3bd8 commit dc37852

File tree

11 files changed

+170
-242
lines changed

11 files changed

+170
-242
lines changed

.github/workflows/binary-galactic.yml

Lines changed: 0 additions & 59 deletions
This file was deleted.

.github/workflows/binary-humble.yml

Lines changed: 0 additions & 57 deletions
This file was deleted.

.github/workflows/binary-iron.yml

Lines changed: 0 additions & 61 deletions
This file was deleted.

.github/workflows/binary-rolling.yml

Lines changed: 0 additions & 57 deletions
This file was deleted.

.github/workflows/ci-ros-lint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ on:
55
jobs:
66
ament_lint:
77
name: ament_${{ matrix.linter }}
8-
runs-on: ubuntu-20.04
8+
runs-on: ubuntu-22.04
99
strategy:
1010
fail-fast: false
1111
matrix:
1212
linter: [copyright, lint_cmake]
1313
steps:
14-
- uses: actions/checkout@v1
15-
- uses: ros-tooling/setup-ros@v0.2
14+
- uses: actions/checkout@v3
15+
- uses: ros-tooling/setup-ros@v0.6
1616
- uses: ros-tooling/[email protected]
1717
with:
1818
distribution: rolling
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Humble Binary Build Main
2+
on:
3+
workflow_dispatch:
4+
branches:
5+
- humble
6+
pull_request:
7+
branches:
8+
- humble
9+
push:
10+
branches:
11+
- humble
12+
schedule:
13+
- cron: '53 5 * * *'
14+
15+
jobs:
16+
binary:
17+
uses: ./.github/workflows/reusable_ici.yml
18+
with:
19+
ros_distro: humble
20+
ros_repo: main
21+
ref_for_scheduled_build: humble
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Humble Binary Build Testing
2+
on:
3+
workflow_dispatch:
4+
branches:
5+
- humble
6+
pull_request:
7+
branches:
8+
- humble
9+
push:
10+
branches:
11+
- humble
12+
schedule:
13+
- cron: '53 5 * * *'
14+
15+
jobs:
16+
binary:
17+
uses: ./.github/workflows/reusable_ici.yml
18+
with:
19+
ros_distro: humble
20+
ros_repo: testing
21+
ref_for_scheduled_build: humble

.github/workflows/prerelease.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
ROS_DISTRO: [humble, rolling]
15+
ROS_DISTRO: [humble]
1616
ROS_REPO: [main]
1717
PRERELEASE: [true]
1818
env:

.github/workflows/reusable_ici.yml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: Reusable industrial_ci workflow
2+
# original author: Denis Štogl <[email protected]>
3+
4+
on:
5+
workflow_call:
6+
inputs:
7+
ref_for_scheduled_build:
8+
description: 'Reference on which the repo should be checkout for scheduled build. Usually is this name of a branch or a tag.'
9+
default: ''
10+
required: false
11+
type: string
12+
13+
upstream_workspace:
14+
description: 'UPSTREAM_WORKSPACE variable for industrial_ci. Usually path to local .repos file.'
15+
required: false
16+
type: string
17+
ros_distro:
18+
description: 'ROS_DISTRO variable for industrial_ci'
19+
required: true
20+
type: string
21+
ros_repo:
22+
description: 'ROS_REPO to run for industrial_ci. Possible values: "main", "testing"'
23+
default: 'main'
24+
required: false
25+
type: string
26+
before_install_upstream_dependencies:
27+
description: 'BEFORE_INSTALL_UPSTREAM_DEPENDENCIES variable for industrial_ci'
28+
default: ''
29+
required: false
30+
type: string
31+
32+
jobs:
33+
reusable_ici:
34+
name: ${{ inputs.ros_distro }} ${{ inputs.ros_repo }} ${{ inputs.os_code_name }}
35+
runs-on: ubuntu-latest
36+
env:
37+
DOCKER_RUN_OPTS: '-v /var/run/docker.sock:/var/run/docker.sock --network ursim_net'
38+
steps:
39+
- name: Checkout ${{ inputs.ref }} when build is not scheduled
40+
if: ${{ github.event_name != 'schedule' }}
41+
uses: actions/checkout@v3
42+
- name: Checkout ${{ inputs.ref }} on scheduled build
43+
if: ${{ github.event_name == 'schedule' }}
44+
uses: actions/checkout@v3
45+
with:
46+
ref: ${{ inputs.ref_for_scheduled_build }}
47+
- run: docker network create --subnet=192.168.56.0/24 ursim_net
48+
- uses: 'ros-industrial/industrial_ci@master'
49+
env:
50+
UPSTREAM_WORKSPACE: ${{ inputs.upstream_workspace }}
51+
ROS_DISTRO: ${{ inputs.ros_distro }}
52+
ROS_REPO: ${{ inputs.ros_repo }}
53+
CMAKE_ARGS: -DUR_ROBOT_DRIVER_BUILD_INTEGRATION_TESTS=ON

README.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,13 @@ This repository contains description files and meshes for *Universal Robots* man
66

77
ROS2 Distro | Branch | Build status | Released packages
88
:---------: | :----: | :----------: | :---------------:
9-
**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)
10-
**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)
11-
**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)
12-
**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)
9+
**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)
10+
**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)
11+
**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)
12+
13+
A more [detailed build status](ci_status.md) shows the state of all CI workflows inside this repo.
14+
Please note that the detailed view is intended for developers, while the one here should give end
15+
users an overview of the current released state.
1316

1417

1518
Note that for ROS2 **Foxy** the description is in the [driver's

0 commit comments

Comments
 (0)