Skip to content

Commit

Permalink
Remove dependency to docker.io (#985)
Browse files Browse the repository at this point in the history
* Remove dependency to docker.io

The dependency was basically added since this is needed to spawn up
ursim. However, the start_ursim script catches the case that no docker
executable is available and the tests requiring it are behind a compile
definition which is off by default.

So, in order to not install docker for users automatically, the dependency
shall be removed.

(cherry picked from commit 585e29f)

# Conflicts:
#	.github/workflows/reusable_ici.yml
  • Loading branch information
fmauch authored and mergify[bot] committed May 7, 2024
1 parent c8d961e commit e87624c
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 1 deletion.
54 changes: 54 additions & 0 deletions .github/workflows/reusable_ici.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
name: Reusable industrial_ci workflow
# original author: Denis Štogl <denis@stoglrobotics.de>

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.'
required: true
type: string
ros_distro:
description: 'ROS_DISTRO variable for industrial_ci'
required: true
type: string
ros_repo:
description: 'ROS_REPO to run for industrial_ci. Possible values: "main", "testing"'
default: 'main'
required: false
type: string
before_install_upstream_dependencies:
description: 'BEFORE_INSTALL_UPSTREAM_DEPENDENCIES variable for industrial_ci'
default: ''
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@v4
- name: Checkout ${{ inputs.ref }} on scheduled build
if: ${{ github.event_name == 'schedule' }}
uses: actions/checkout@v4
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
ADDITIONAL_DEBS: docker.io netcat-openbsd # Needed for integration tests
1 change: 0 additions & 1 deletion ur_robot_driver/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
<exec_depend>velocity_controllers</exec_depend>
<exec_depend>xacro</exec_depend>

<test_depend>docker.io</test_depend>
<test_depend>launch_testing_ament_cmake</test_depend>

<export>
Expand Down

0 comments on commit e87624c

Please sign in to comment.