Skip to content

Commit 077bac5

Browse files
authored
Update ci (#1315)
* Remove github.job from cache identifier It is the same for all of them, anyway * Remove semi-binary-testing builds They don't make a lot of sense. We don't need to know whether our direct dependencies fail on the testing repos. * Do not require setting an upstream workspace It could potentially just be empty. With that we can remove the empty not-released files * Add hardware_interface_testing as test_depend for ur_controllers The test_actuator is used in the load tests
1 parent 65679b2 commit 077bac5

14 files changed

+4
-80
lines changed

.github/workflows/coverage-build.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ jobs:
2929
ur_calibration
3030
ur_controllers
3131
ur_robot_driver
32-
vcs-repo-file-url: |
33-
https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }}/Universal_Robots_ROS2_Driver-not-released.${{ env.ROS_DISTRO }}.repos
3432
colcon-defaults: |
3533
{
3634
"build": {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,4 @@ jobs:
1111
with:
1212
ros_distro: humble
1313
ros_repo: main
14-
upstream_workspace: Universal_Robots_ROS2_Driver-not-released.humble.repos
1514
ref_for_scheduled_build: humble

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,4 @@ jobs:
1212
with:
1313
ros_distro: humble
1414
ros_repo: testing
15-
upstream_workspace: Universal_Robots_ROS2_Driver-not-released.humble.repos
1615
ref_for_scheduled_build: humble

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

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

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,4 @@ jobs:
1717
with:
1818
ros_distro: jazzy
1919
ros_repo: main
20-
upstream_workspace: Universal_Robots_ROS2_Driver-not-released.jazzy.repos
2120
ref_for_scheduled_build: main

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,4 @@ jobs:
1717
with:
1818
ros_distro: jazzy
1919
ros_repo: testing
20-
upstream_workspace: Universal_Robots_ROS2_Driver-not-released.jazzy.repos
2120
ref_for_scheduled_build: main

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

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

.github/workflows/reusable_ici.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ on:
1212

1313
upstream_workspace:
1414
description: 'UPSTREAM_WORKSPACE variable for industrial_ci. Usually path to local .repos file.'
15-
required: true
15+
required: false
16+
default: ''
1617
type: string
1718
ros_distro:
1819
description: 'ROS_DISTRO variable for industrial_ci'
@@ -41,7 +42,7 @@ jobs:
4142
env:
4243
DOCKER_RUN_OPTS: '-v /var/run/docker.sock:/var/run/docker.sock --network ursim_net'
4344
CCACHE_DIR: ${{ github.workspace }}/${{ inputs.ccache_dir }}
44-
CACHE_PREFIX: ${{ inputs.ros_distro }}-${{ inputs.upstream_workspace }}-${{ inputs.ros_repo }}-${{ github.job }}
45+
CACHE_PREFIX: ${{ inputs.ros_distro }}-${{ inputs.upstream_workspace }}-${{ inputs.ros_repo }}
4546
steps:
4647
- name: Checkout ${{ github.ref_name }} since build is not scheduled
4748
if: ${{ github.event_name != 'schedule' }}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,4 @@ jobs:
1717
with:
1818
ros_distro: rolling
1919
ros_repo: main
20-
upstream_workspace: Universal_Robots_ROS2_Driver-not-released.rolling.repos
2120
ref_for_scheduled_build: main

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,4 @@ jobs:
1717
with:
1818
ros_distro: rolling
1919
ros_repo: testing
20-
upstream_workspace: Universal_Robots_ROS2_Driver-not-released.rolling.repos
2120
ref_for_scheduled_build: main

0 commit comments

Comments
 (0)