Skip to content

Commit 3cbfeb6

Browse files
urfeexurfeex
authored
Add kilted (#279)
* Update Workflow files to be named and fix syntax * Add Kilted workflows and status to README * Fix prerelease tests
1 parent 6e938e3 commit 3cbfeb6

12 files changed

+61
-53
lines changed

‎.github/workflows/humble-binary-main.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
name: Humble Binary Build Main
22
on:
33
workflow_dispatch:
4-
branches:
5-
- humble
64
pull_request:
75
branches:
86
- humble
@@ -13,7 +11,7 @@ on:
1311
- cron: '53 5 * * *'
1412

1513
jobs:
16-
binary:
14+
humble_binary_main:
1715
uses: ./.github/workflows/reusable_ici.yml
1816
with:
1917
ros_distro: humble

‎.github/workflows/humble-binary-testing.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
name: Humble Binary Build Testing
22
on:
33
workflow_dispatch:
4-
branches:
5-
- humble
64
pull_request:
75
branches:
86
- humble
@@ -13,7 +11,7 @@ on:
1311
- cron: '53 5 * * *'
1412

1513
jobs:
16-
binary:
14+
humble_binary_testing:
1715
uses: ./.github/workflows/reusable_ici.yml
1816
with:
1917
ros_distro: humble

‎.github/workflows/jazzy-binary-main.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
name: Jazzy Binary Build Main
22
on:
33
workflow_dispatch:
4-
branches:
5-
- rolling
64
pull_request:
75
branches:
86
- rolling
@@ -14,7 +12,7 @@ on:
1412
- cron: '53 5 * * *'
1513

1614
jobs:
17-
binary:
15+
jazzy_binary_main:
1816
uses: ./.github/workflows/reusable_ici.yml
1917
with:
2018
ros_distro: jazzy

‎.github/workflows/jazzy-binary-testing.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
name: Jazzy Binary Build Testing
22
on:
33
workflow_dispatch:
4-
branches:
5-
- rolling
64
pull_request:
75
branches:
86
- rolling
@@ -14,9 +12,9 @@ on:
1412
- cron: '53 5 * * *'
1513

1614
jobs:
17-
binary:
15+
jazzy_binary_testing:
1816
uses: ./.github/workflows/reusable_ici.yml
1917
with:
20-
ros_distro: rolling
18+
ros_distro: jazzy
2119
ros_repo: testing
2220
ref_for_scheduled_build: rolling

‎.github/workflows/kilted-binary-main.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Kilted Binary Build Main
2+
on:
3+
workflow_dispatch:
4+
pull_request:
5+
branches:
6+
- rolling
7+
push:
8+
branches:
9+
- rolling
10+
schedule:
11+
- cron: '53 5 * * *'
12+
13+
jobs:
14+
kilted_binary_main:
15+
uses: ./.github/workflows/reusable_ici.yml
16+
with:
17+
ros_distro: kilted
18+
ros_repo: main
19+
ref_for_scheduled_build: rolling

‎.github/workflows/kilted-binary-testing.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Kilted Binary Build Testing
2+
on:
3+
workflow_dispatch:
4+
pull_request:
5+
branches:
6+
- rolling
7+
push:
8+
branches:
9+
- rolling
10+
schedule:
11+
- cron: '53 5 * * *'
12+
13+
jobs:
14+
kilted_binary_testing:
15+
uses: ./.github/workflows/reusable_ici.yml
16+
with:
17+
ros_distro: kilted
18+
ros_repo: testing
19+
ref_for_scheduled_build: rolling

‎.github/workflows/prerelease.yml‎

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -12,43 +12,15 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
ROS_DISTRO: [rolling]
15+
ROS_DISTRO: [jazzy, kilted, rolling]
1616
ROS_REPO: [main]
1717
PRERELEASE: [true]
1818
env:
19-
CCACHE_DIR: ${{ github.workspace }}/.ccache
2019
BASEDIR: ${{ github.workspace }}/.work
21-
CACHE_PREFIX: ${{ matrix.ROS_DISTRO }}-${{ matrix.ROS_REPO }}
2220
steps:
2321
- uses: actions/checkout@v4
24-
# The target directory cache doesn't include the source directory because
25-
# that comes from the checkout. See "prepare target_ws for cache" task below
26-
- name: cache target_ws
27-
if: ${{ ! matrix.CCOV }}
28-
uses: pat-s/[email protected]
29-
with:
30-
path: ${{ env.BASEDIR }}/target_ws
31-
key: target_ws-${{ env.CACHE_PREFIX }}-${{ hashFiles('**/CMakeLists.txt', '**/package.xml') }}-${{ github.run_id }}
32-
restore-keys: |
33-
target_ws-${{ env.CACHE_PREFIX }}-${{ hashFiles('**/CMakeLists.txt', '**/package.xml') }}
34-
- name: cache ccache
35-
uses: pat-s/[email protected]
36-
with:
37-
path: ${{ env.CCACHE_DIR }}
38-
key: ccache-${{ env.CACHE_PREFIX }}-${{ github.sha }}-${{ github.run_id }}
39-
restore-keys: |
40-
ccache-${{ env.CACHE_PREFIX }}-${{ github.sha }}
41-
ccache-${{ env.CACHE_PREFIX }}
4222
- uses: 'ros-industrial/industrial_ci@master'
4323
env:
4424
ROS_DISTRO: ${{ matrix.ROS_DISTRO }}
4525
ROS_REPO: ${{ matrix.ROS_REPO }}
4626
PRERELEASE: ${{ matrix.PRERELEASE }}
47-
48-
- name: prepare target_ws for cache
49-
if: ${{ always() && ! matrix.CCOV }}
50-
run: |
51-
du -sh ${{ env.BASEDIR }}/target_ws
52-
sudo find ${{ env.BASEDIR }}/target_ws -wholename '*/test_results/*' -delete
53-
sudo rm -rf ${{ env.BASEDIR }}/target_ws/src
54-
du -sh ${{ env.BASEDIR }}/target_ws

‎.github/workflows/reusable_ici.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ on:
99
default: ''
1010
required: false
1111
type: string
12-
1312
upstream_workspace:
1413
description: 'UPSTREAM_WORKSPACE variable for industrial_ci. Usually path to local .repos file.'
1514
required: false
@@ -33,8 +32,6 @@ jobs:
3332
reusable_ici:
3433
name: ${{ inputs.ros_distro }} ${{ inputs.ros_repo }} ${{ inputs.os_code_name }}
3534
runs-on: ubuntu-latest
36-
env:
37-
DOCKER_RUN_OPTS: '-v /var/run/docker.sock:/var/run/docker.sock --network ursim_net'
3835
steps:
3936
- name: Checkout ${{ inputs.ref }} when build is not scheduled
4037
if: ${{ github.event_name != 'schedule' }}
@@ -44,10 +41,8 @@ jobs:
4441
uses: actions/checkout@v4
4542
with:
4643
ref: ${{ inputs.ref_for_scheduled_build }}
47-
- run: docker network create --subnet=192.168.56.0/24 ursim_net
4844
- uses: 'ros-industrial/industrial_ci@master'
4945
env:
5046
UPSTREAM_WORKSPACE: ${{ inputs.upstream_workspace }}
5147
ROS_DISTRO: ${{ inputs.ros_distro }}
5248
ROS_REPO: ${{ inputs.ros_repo }}
53-
CMAKE_ARGS: -DUR_ROBOT_DRIVER_BUILD_INTEGRATION_TESTS=ON

‎.github/workflows/rolling-binary-main.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
name: Rolling Binary Build Main
22
on:
33
workflow_dispatch:
4-
branches:
5-
- rolling
64
pull_request:
75
branches:
86
- rolling
@@ -14,7 +12,7 @@ on:
1412
- cron: '53 5 * * *'
1513

1614
jobs:
17-
binary:
15+
rolling_binary_main:
1816
uses: ./.github/workflows/reusable_ici.yml
1917
with:
2018
ros_distro: rolling

‎.github/workflows/rolling-binary-testing.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
name: Rolling Binary Build Testing
22
on:
33
workflow_dispatch:
4-
branches:
5-
- rolling
64
pull_request:
75
branches:
86
- rolling
@@ -14,7 +12,7 @@ on:
1412
- cron: '53 5 * * *'
1513

1614
jobs:
17-
binary:
15+
rolling_binary_main:
1816
uses: ./.github/workflows/reusable_ici.yml
1917
with:
2018
ros_distro: rolling

0 commit comments

Comments
 (0)