Skip to content

Commit f96fe15

Browse files
authored
Add lyrical build and migrate rolling to resolute (#499)
Update builds to contain ROS lyrical and roll rolling to ROS resolute.
1 parent 020cb55 commit f96fe15

2 files changed

Lines changed: 10 additions & 11 deletions

File tree

.github/workflows/industrial-ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,18 @@ jobs:
1616
ROS_DISTRO:
1717
- NAME: noetic
1818
DOWNSTREAM_WORKSPACE: "github:UniversalRobots/Universal_Robots_ROS_Driver#master"
19-
CLANG_TIDY: ""
2019
- NAME: humble
2120
DOWNSTREAM_WORKSPACE: "github:UniversalRobots/Universal_Robots_ROS2_Driver#humble"
22-
CLANG_TIDY: ""
2321
- NAME: jazzy
2422
DOWNSTREAM_WORKSPACE: "github:UniversalRobots/Universal_Robots_ROS2_Driver#jazzy"
25-
CLANG_TIDY: ""
2623
- NAME: kilted
24+
DOWNSTREAM_WORKSPACE: "github:UniversalRobots/Universal_Robots_ROS2_Driver#kilted"
25+
- NAME: lyrical
2726
DOWNSTREAM_WORKSPACE: "github:UniversalRobots/Universal_Robots_ROS2_Driver#main"
28-
CLANG_TIDY: ""
2927
- NAME: rolling
3028
DOWNSTREAM_WORKSPACE: "github:UniversalRobots/Universal_Robots_ROS2_Driver#main"
3129
CLANG_TIDY: pedantic
30+
OS_CODE_NAME: "resolute"
3231
ROS_REPO:
3332
- main
3433
- testing
@@ -47,3 +46,4 @@ jobs:
4746
ROS_DISTRO: ${{matrix.ROS_DISTRO.NAME}}
4847
ROS_REPO: ${{matrix.ROS_REPO}}
4948
CLANG_TIDY: ${{matrix.ROS_DISTRO.CLANG_TIDY}}
49+
OS_CODE_NAME: ${{matrix.ROS_DISTRO.OS_CODE_NAME}}

.github/workflows/prerelease.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,22 @@ on:
77
jobs:
88
prerelease_test:
99
runs-on: ubuntu-latest
10+
if: contains(github.event.pull_request.labels.*.name, 'release')
1011

1112
strategy:
1213
fail-fast: false
1314
matrix:
1415
include:
15-
- ROS_DISTRO: melodic
16-
OS_VERSION: bionic
17-
- ROS_DISTRO: noetic
18-
OS_VERSION: focal
1916
- ROS_DISTRO: humble
2017
OS_VERSION: jammy
21-
- ROS_DISTRO: iron
22-
OS_VERSION: jammy
2318
- ROS_DISTRO: jazzy
2419
OS_VERSION: noble
25-
- ROS_DISTRO: rolling
20+
- ROS_DISTRO: kilted
2621
OS_VERSION: noble
22+
- ROS_DISTRO: lyrical
23+
OS_VERSION: resolute
24+
- ROS_DISTRO: rolling
25+
OS_VERSION: resolute
2726

2827
steps:
2928
- uses: actions/checkout@v6

0 commit comments

Comments
 (0)