Skip to content

Update ci #1315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 26, 2025
Merged

Update ci #1315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db6f6af
Remove github.job from cache identifier
urfeex Mar 25, 2025
d28a47a
Remove semi-binary-testing builds
urfeex Mar 25, 2025
7c4212e
Do not require setting an upstream workspace
urfeex Mar 25, 2025
8e9a204
Add hardware_interface_testing as test_depend for ur_controllers
urfeex Mar 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/coverage-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ jobs:
ur_calibration
ur_controllers
ur_robot_driver
vcs-repo-file-url: |
https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }}/Universal_Robots_ROS2_Driver-not-released.${{ env.ROS_DISTRO }}.repos
colcon-defaults: |
{
"build": {
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/humble-binary-main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,4 @@ jobs:
with:
ros_distro: humble
ros_repo: main
upstream_workspace: Universal_Robots_ROS2_Driver-not-released.humble.repos
ref_for_scheduled_build: humble
1 change: 0 additions & 1 deletion .github/workflows/humble-binary-testing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,4 @@ jobs:
with:
ros_distro: humble
ros_repo: testing
upstream_workspace: Universal_Robots_ROS2_Driver-not-released.humble.repos
ref_for_scheduled_build: humble
16 changes: 0 additions & 16 deletions .github/workflows/humble-semi-binary-testing.yml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion .github/workflows/jazzy-binary-main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,4 @@ jobs:
with:
ros_distro: jazzy
ros_repo: main
upstream_workspace: Universal_Robots_ROS2_Driver-not-released.jazzy.repos
ref_for_scheduled_build: main
1 change: 0 additions & 1 deletion .github/workflows/jazzy-binary-testing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,4 @@ jobs:
with:
ros_distro: jazzy
ros_repo: testing
upstream_workspace: Universal_Robots_ROS2_Driver-not-released.jazzy.repos
ref_for_scheduled_build: main
21 changes: 0 additions & 21 deletions .github/workflows/jazzy-semi-binary-testing.yml
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions .github/workflows/reusable_ici.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ on:

upstream_workspace:
description: 'UPSTREAM_WORKSPACE variable for industrial_ci. Usually path to local .repos file.'
required: true
required: false
default: ''
type: string
ros_distro:
description: 'ROS_DISTRO variable for industrial_ci'
Expand Down Expand Up @@ -41,7 +42,7 @@ jobs:
env:
DOCKER_RUN_OPTS: '-v /var/run/docker.sock:/var/run/docker.sock --network ursim_net'
CCACHE_DIR: ${{ github.workspace }}/${{ inputs.ccache_dir }}
CACHE_PREFIX: ${{ inputs.ros_distro }}-${{ inputs.upstream_workspace }}-${{ inputs.ros_repo }}-${{ github.job }}
CACHE_PREFIX: ${{ inputs.ros_distro }}-${{ inputs.upstream_workspace }}-${{ inputs.ros_repo }}
steps:
- name: Checkout ${{ github.ref_name }} since build is not scheduled
if: ${{ github.event_name != 'schedule' }}
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/rolling-binary-main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,4 @@ jobs:
with:
ros_distro: rolling
ros_repo: main
upstream_workspace: Universal_Robots_ROS2_Driver-not-released.rolling.repos
ref_for_scheduled_build: main
1 change: 0 additions & 1 deletion .github/workflows/rolling-binary-testing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,4 @@ jobs:
with:
ros_distro: rolling
ros_repo: testing
upstream_workspace: Universal_Robots_ROS2_Driver-not-released.rolling.repos
ref_for_scheduled_build: main
21 changes: 0 additions & 21 deletions .github/workflows/rolling-semi-binary-testing.yml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions Universal_Robots_ROS2_Driver-not-released.jazzy.repos
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions Universal_Robots_ROS2_Driver-not-released.rolling.repos
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions ur_controllers/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@

<test_depend>controller_manager</test_depend>
<test_depend>ros2_control_test_assets</test_depend>
<test_depend>hardware_interface_testing</test_depend>

<export>
<build_type>ament_cmake</build_type>
Expand Down
Loading