From 08693d70f5a59ea651be8ef60a613a932e7c5df4 Mon Sep 17 00:00:00 2001 From: Felix Exner Date: Mon, 19 May 2025 14:11:14 +0200 Subject: [PATCH 1/3] Update more upstream repo branches for Jazzy ur_description and ros2_controllers now also have branched out for jazzy --- Universal_Robots_ROS2_Driver.jazzy.repos | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Universal_Robots_ROS2_Driver.jazzy.repos b/Universal_Robots_ROS2_Driver.jazzy.repos index b0ec262d7..729b91789 100644 --- a/Universal_Robots_ROS2_Driver.jazzy.repos +++ b/Universal_Robots_ROS2_Driver.jazzy.repos @@ -6,7 +6,7 @@ repositories: Universal_Robots_ROS2_Description: type: git url: https://github.com/UniversalRobots/Universal_Robots_ROS2_Description.git - version: rolling + version: jazzy ur_msgs: type: git url: https://github.com/ros-industrial/ur_msgs.git @@ -18,7 +18,7 @@ repositories: ros2_controllers: type: git url: https://github.com/ros-controls/ros2_controllers - version: master + version: jazzy kinematics_interface: type: git url: https://github.com/ros-controls/kinematics_interface.git From 4c1227ca9560cb003afbc1ed486cb2367cb68480 Mon Sep 17 00:00:00 2001 From: Felix Exner Date: Mon, 19 May 2025 14:11:40 +0200 Subject: [PATCH 2/3] Update README and ci_status to have a jazzy branch --- README.md | 2 +- ci_status.md | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 7f6d8ce6e..30aea6242 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Check also [presentations and videos](ur_robot_driver/doc/resources/README.md) a Branch humble - main + jazzy main main diff --git a/ci_status.md b/ci_status.md index ea6bdcbdb..7c26e67d6 100644 --- a/ci_status.md +++ b/ci_status.md @@ -13,7 +13,7 @@ red pipeline there should be a corresponding issue labeled with [ci-failure](htt humble - main + jazzy main main @@ -33,16 +33,16 @@ red pipeline there should be a corresponding issue labeled with [ci-failure](htt
- - + Jazzy Binary Main
- - + Jazzy Binary Testing
- - + Jazzy Semi-Binary Main
From 43e2bde662f391ac283409ce538f34ed932b2c9a Mon Sep 17 00:00:00 2001 From: Felix Exner Date: Mon, 19 May 2025 14:16:45 +0200 Subject: [PATCH 3/3] Update jazzy workflows - Remove PR and push triggers for main branch - Set reference for scheduled build to jazzy --- .github/workflows/jazzy-binary-main.yml | 8 +------- .github/workflows/jazzy-binary-testing.yml | 8 +------- .github/workflows/jazzy-semi-binary-main.yml | 8 +------- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/.github/workflows/jazzy-binary-main.yml b/.github/workflows/jazzy-binary-main.yml index a1c313364..ecd1fbcb1 100644 --- a/.github/workflows/jazzy-binary-main.yml +++ b/.github/workflows/jazzy-binary-main.yml @@ -1,12 +1,6 @@ name: Jazzy Binary Build Main on: workflow_dispatch: - pull_request: - branches: - - main - push: - branches: - - main schedule: # Run every morning to detect flakiness and broken dependencies - cron: '13 4 * * *' @@ -17,4 +11,4 @@ jobs: with: ros_distro: jazzy ros_repo: main - ref_for_scheduled_build: main + ref_for_scheduled_build: jazzy diff --git a/.github/workflows/jazzy-binary-testing.yml b/.github/workflows/jazzy-binary-testing.yml index 06cf52886..b21e33f8c 100644 --- a/.github/workflows/jazzy-binary-testing.yml +++ b/.github/workflows/jazzy-binary-testing.yml @@ -1,12 +1,6 @@ name: Jazzy Binary Build Testing on: workflow_dispatch: - pull_request: - branches: - - main - push: - branches: - - main schedule: # Run every morning to detect flakiness and broken dependencies - cron: '13 4 * * *' @@ -17,4 +11,4 @@ jobs: with: ros_distro: jazzy ros_repo: testing - ref_for_scheduled_build: main + ref_for_scheduled_build: jazzy diff --git a/.github/workflows/jazzy-semi-binary-main.yml b/.github/workflows/jazzy-semi-binary-main.yml index 006291bf8..0d302247d 100644 --- a/.github/workflows/jazzy-semi-binary-main.yml +++ b/.github/workflows/jazzy-semi-binary-main.yml @@ -1,12 +1,6 @@ name: Jazzy Semi Binary Build Main on: workflow_dispatch: - pull_request: - branches: - - main - push: - branches: - - main schedule: # Run every morning to detect flakiness and broken dependencies - cron: '13 4 * * *' @@ -18,4 +12,4 @@ jobs: ros_distro: jazzy ros_repo: main upstream_workspace: Universal_Robots_ROS2_Driver.jazzy.repos - ref_for_scheduled_build: main + ref_for_scheduled_build: jazzy