Skip to content

Commit

Permalink
Update branches in CI and README
Browse files Browse the repository at this point in the history
  • Loading branch information
fmauch committed Apr 15, 2024
1 parent 48c96e3 commit 54d7086
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 20 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/iron-binary-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ name: Iron Binary Main
on:
workflow_dispatch:
branches:
- ros2
- iron
pull_request:
branches:
- ros2
- iron
push:
branches:
- ros2
- iron
schedule:
- cron: '13 4 * * *'

Expand All @@ -18,4 +18,4 @@ jobs:
with:
ros_distro: iron
ros_repo: main
ref_for_scheduled_build: ros2
ref_for_scheduled_build: iron
8 changes: 4 additions & 4 deletions .github/workflows/iron-binary-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ name: Iron Binary Testing
on:
workflow_dispatch:
branches:
- ros2
- iron
pull_request:
branches:
- ros2
- iron
push:
branches:
- ros2
- iron
schedule:
- cron: '13 4 * * *'

Expand All @@ -18,4 +18,4 @@ jobs:
with:
ros_distro: iron
ros_repo: testing
ref_for_scheduled_build: ros2
ref_for_scheduled_build: iron
8 changes: 4 additions & 4 deletions .github/workflows/iron-semi-binary-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ name: Iron Semi Binary Main
on:
workflow_dispatch:
branches:
- ros2
- iron
pull_request:
branches:
- ros2
- iron
push:
branches:
- ros2
- iron
schedule:
- cron: '13 4 * * *'

Expand All @@ -18,5 +18,5 @@ jobs:
with:
ros_distro: iron
ros_repo: main
ref_for_scheduled_build: ros2
ref_for_scheduled_build: iron
upstream_workspace: ur_simulation_gz.iron.repos
8 changes: 4 additions & 4 deletions .github/workflows/iron-semi-binary-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ name: Iron Semi Binary Testing
on:
workflow_dispatch:
branches:
- ros2
- iron
pull_request:
branches:
- ros2
- iron
push:
branches:
- ros2
- iron
schedule:
- cron: '13 4 * * *'

Expand All @@ -18,5 +18,5 @@ jobs:
with:
ros_distro: iron
ros_repo: testing
ref_for_scheduled_build: ros2
ref_for_scheduled_build: iron
upstream_workspace: ur_simulation_gz.iron.repos
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ Example files and configurations for Gazebo simulation of Universal Robots' mani
</tr>
<tr>
<th>Branch</th>
<td><a href="https://github.com/UniversalRobots/Universal_Robots_ROS2_Description/tree/ros2">ros2</a></td>
<td><a href="https://github.com/UniversalRobots/Universal_Robots_ROS2_Description/tree/ros2">ros2</a></td>
<td><a href="https://github.com/UniversalRobots/Universal_Robots_ROS2_Description/tree/humble">humble</a></td>
<td><a href="https://github.com/UniversalRobots/Universal_Robots_ROS2_Description/tree/iron">iron</a></td>
<td><a href="https://github.com/UniversalRobots/Universal_Robots_ROS2_Description/tree/ros2">ros2</a></td>
</tr>
<tr>
Expand Down
2 changes: 1 addition & 1 deletion ur_simulation_gz-not-released.rolling.repos
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
repositories:
gz_ros2_control:
type: git
url: https://github.com/ignitionrobotics/gz_ros2_control.git
url: https://github.com/ros-controls/gz_ros2_control.git
version: master
6 changes: 5 additions & 1 deletion ur_simulation_gz.rolling.repos
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
repositories:
ign_ros2_control:
type: git
url: https://github.com/ignitionrobotics/gz_ros2_control.git
url: https://github.com/ros-controls/gz_ros2_control.git
version: master
ros_ign:
type: git
Expand All @@ -11,6 +11,10 @@ repositories:
type: git
url: https://github.com/ros-planning/moveit2.git
version: main
moveit_msgs:
type: git
url: https://github.com/ros-planning/moveit_msgs.git
version: ros2
ros2_control:
type: git
url: https://github.com/ros-controls/ros2_control.git
Expand Down

0 comments on commit 54d7086

Please sign in to comment.