Skip to content

Commit 0ca8d9e

Browse files
author
Felix Exner
committed
Add MoveIt to semi-binary workspace
Also enabled CCache, since building MoveIt takes a very long time otherwise.
1 parent 512c24b commit 0ca8d9e

File tree

4 files changed

+63
-0
lines changed

4 files changed

+63
-0
lines changed

.github/workflows/reusable_ici.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,26 @@ on:
2828
default: ''
2929
required: false
3030
type: string
31+
ccache_dir:
32+
description: 'Local path to store cache (from "github.workspace"). For standard industrial_ci configuration do not have to be changed'
33+
default: '.ccache'
34+
required: false
35+
type: string
36+
basedir:
37+
description: 'Local path to workspace base directory to cache (from "github.workspace"). For standard industrial_ci configuration do not have to be changed'
38+
default: '.work'
39+
required: false
40+
type: string
3141

3242
jobs:
3343
reusable_ici:
3444
name: ${{ inputs.ros_distro }} ${{ inputs.ros_repo }} ${{ inputs.os_code_name }}
3545
runs-on: ubuntu-latest
3646
env:
3747
DOCKER_RUN_OPTS: '-v /var/run/docker.sock:/var/run/docker.sock --network ursim_net'
48+
CCACHE_DIR: ${{ github.workspace }}/${{ inputs.ccache_dir }}
49+
BASEDIR: ${{ github.workspace }}/${{ inputs.basedir }}
50+
CACHE_PREFIX: ${{ inputs.ros_distro }}-${{ inputs.upstream_workspace }}-${{ inputs.ros_repo }}-${{ github.job }}
3851
steps:
3952
- name: Checkout ${{ inputs.ref }} when build is not scheduled
4053
if: ${{ github.event_name != 'schedule' }}
@@ -45,9 +58,32 @@ jobs:
4558
with:
4659
ref: ${{ inputs.ref_for_scheduled_build }}
4760
- run: docker network create --subnet=192.168.56.0/24 ursim_net
61+
- name: cache target_ws
62+
if: ${{ ! matrix.env.CCOV }}
63+
uses: pat-s/[email protected]
64+
with:
65+
path: ${{ env.BASEDIR }}/target_ws
66+
key: target_ws-${{ env.CACHE_PREFIX }}-${{ hashFiles('**/CMakeLists.txt', '**/package.xml') }}-${{ github.run_id }}
67+
restore-keys: |
68+
target_ws-${{ env.CACHE_PREFIX }}-${{ hashFiles('**/CMakeLists.txt', '**/package.xml') }}
69+
- name: cache ccache
70+
uses: pat-s/[email protected]
71+
with:
72+
path: ${{ env.CCACHE_DIR }}
73+
key: ccache-${{ env.CACHE_PREFIX }}-${{ github.sha }}-${{ github.run_id }}
74+
restore-keys: |
75+
ccache-${{ env.CACHE_PREFIX }}-${{ github.sha }}
76+
ccache-${{ env.CACHE_PREFIX }}
4877
- uses: 'ros-industrial/industrial_ci@master'
4978
env:
5079
UPSTREAM_WORKSPACE: ${{ inputs.upstream_workspace }}
5180
ROS_DISTRO: ${{ inputs.ros_distro }}
5281
ROS_REPO: ${{ inputs.ros_repo }}
5382
CMAKE_ARGS: -DUR_ROBOT_DRIVER_BUILD_INTEGRATION_TESTS=ON
83+
- name: prepare target_ws for cache
84+
if: ${{ always() && ! matrix.env.CCOV }}
85+
run: |
86+
du -sh ${{ env.BASEDIR }}/target_ws
87+
sudo find ${{ env.BASEDIR }}/target_ws -wholename '*/test_results/*' -delete
88+
sudo rm -rf ${{ env.BASEDIR }}/target_ws/src
89+
du -sh ${{ env.BASEDIR }}/target_ws

Universal_Robots_ROS2_Driver.humble.repos

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,12 @@ repositories:
2727
type: git
2828
url: https://github.com/ros-controls/control_msgs.git
2929
version: humble
30+
moveit2:
31+
type: git
32+
url: https://github.com/ros-planning/moveit2.git
33+
version: humble
34+
35+
moveit_msgs:
36+
type: git
37+
url: https://github.com/ros-planning/moveit_msgs.git
38+
version: humble

Universal_Robots_ROS2_Driver.iron.repos

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,12 @@ repositories:
2727
type: git
2828
url: https://github.com/ros-controls/control_msgs.git
2929
version: master
30+
moveit2:
31+
type: git
32+
url: https://github.com/ros-planning/moveit2.git
33+
version: iron
34+
35+
moveit_msgs:
36+
type: git
37+
url: https://github.com/ros-planning/moveit_msgs.git
38+
version: iron

Universal_Robots_ROS2_Driver.rolling.repos

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,12 @@ repositories:
2727
type: git
2828
url: https://github.com/ros-controls/control_msgs.git
2929
version: master
30+
moveit2:
31+
type: git
32+
url: https://github.com/ros-planning/moveit2.git
33+
version: main
34+
35+
moveit_msgs:
36+
type: git
37+
url: https://github.com/ros-planning/moveit_msgs.git
38+
version: ros2

0 commit comments

Comments
 (0)