Skip to content
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.

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

Use dedicated build for noetic main #640

Merged
merged 9 commits into from
Oct 10, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
63 changes: 0 additions & 63 deletions .github/workflows/ci.yml

This file was deleted.

18 changes: 18 additions & 0 deletions .github/workflows/ci_format.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Clang-Format check
on:
push:
pull_request:
branches:
- main
RobertWilbrandt marked this conversation as resolved.
Show resolved Hide resolved

jobs:
format_check:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: 'ros-industrial/industrial_ci@master'
env:
ROS_DISTRO: noetic
CLANG_FORMAT_CHECK: file
CLANG_FORMAT_VERSION: "9"
22 changes: 22 additions & 0 deletions .github/workflows/noetic-binary-main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Noetic Binary Build Main
on:
workflow_dispatch:
branches:
- master
pull_request:
branches:
- master
push:
branches:
- master
schedule:
# Run every morning to detect flakiness and broken dependencies
- cron: '32 5 * * *'

jobs:
binary:
uses: ./.github/workflows/reusable_ici.yml
with:
ros_distro: noetic
ros_repo: main
ref_for_scheduled_build: master
49 changes: 49 additions & 0 deletions .github/workflows/reusable_ici.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Reusable industrial_ci workflow
# original author: Denis Štogl <[email protected]>

on:
workflow_call:
inputs:
ref_for_scheduled_build:
description: 'Reference on which the repo should be checkout for scheduled build. Usually is this name of a branch or a tag.'
default: ''
required: false
type: string

upstream_workspace:
description: 'UPSTREAM_WORKSPACE variable for industrial_ci. Usually path to local .repos file.'
default: ''
required: false
type: string
ros_distro:
description: 'ROS_DISTRO variable for industrial_ci'
required: false
type: string
ros_repo:
description: 'ROS_REPO to run for industrial_ci. Possible values: "main", "testing"'
default: 'main'
required: false
type: string

jobs:
reusable_ici:
name: ${{ inputs.ros_distro }} ${{ inputs.ros_repo }} ${{ inputs.os_code_name }}
runs-on: ubuntu-latest
env:
DOCKER_RUN_OPTS: '-v /var/run/docker.sock:/var/run/docker.sock --network ursim_net'
steps:
- name: Checkout ${{ inputs.ref }} when build is not scheduled
if: ${{ github.event_name != 'schedule' }}
uses: actions/checkout@v3
- name: Checkout ${{ inputs.ref }} on scheduled build
if: ${{ github.event_name == 'schedule' }}
uses: actions/checkout@v3
with:
ref: ${{ inputs.ref_for_scheduled_build }}
- run: docker network create --subnet=192.168.56.0/24 ursim_net
- uses: 'ros-industrial/industrial_ci@master'
env:
UPSTREAM_WORKSPACE: ${{ inputs.upstream_workspace }}
ROS_DISTRO: ${{ inputs.ros_distro }}
ROS_REPO: ${{ inputs.ros_repo }}
CMAKE_ARGS: -DUR_ROBOT_DRIVER_BUILD_INTEGRATION_TESTS=ON
4 changes: 2 additions & 2 deletions ur_robot_driver/launch/ur_control.launch
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,11 @@

<!-- spawn controller manager -->
<node name="ros_control_controller_spawner" pkg="controller_manager" type="spawner" respawn="false"
output="screen" args="$(arg controllers)" />
output="screen" args="$(arg controllers) --timeout 600" />

<!-- load other controller -->
<node name="ros_control_stopped_spawner" pkg="controller_manager" type="spawner" respawn="false"
output="screen" args="--stopped $(arg stopped_controllers)" unless="$(eval arg('stopped_controllers') == '')"/>
output="screen" args="--stopped $(arg stopped_controllers) --timeout 600" unless="$(eval arg('stopped_controllers') == '')"/>

<node name="controller_stopper" pkg="ur_robot_driver" type="controller_stopper_node" respawn="false" output="screen">
<remap from="robot_running" to="ur_hardware_interface/robot_program_running"/>
Expand Down
3 changes: 3 additions & 0 deletions ur_robot_driver/test/driver.test
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
<arg name="stopped_controllers" value="forward_joint_traj_controller forward_cartesian_traj_controller twist_controller pose_based_cartesian_traj_controller joint_based_cartesian_traj_controller"/>
</include>

<node name="ursim" pkg="ur_client_library" type="start_ursim.sh" respawn="false" output="screen">
</node>

<!--If the default controller changes, this remap has to be adapted, as well-->
<remap from="follow_joint_trajectory" to="/scaled_pos_joint_traj_controller/follow_joint_trajectory" />
<remap from="forward_cartesian_trajectory" to="/forward_cartesian_traj_controller/follow_cartesian_trajectory" />
Expand Down