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

Cleanup workflows #1177

Merged
merged 7 commits into from
Nov 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
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
5 changes: 1 addition & 4 deletions .github/workflows/humble-binary-main.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
name: Humble Binary Build Main
on:
workflow_dispatch:
branches:
- humble
schedule:
# Run every morning to detect flakiness and broken dependencies
- cron: '03 5 * * *'


jobs:
binary:
humble_binary_main:
uses: ./.github/workflows/reusable_ici.yml
with:
ros_distro: humble
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/humble-binary-testing.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
name: Humble Binary Build Testing
on:
workflow_dispatch:
branches:
- humble
schedule:
# Run every morning to detect flakiness and broken dependencies
- cron: '03 5 * * *'


jobs:
binary:
humble_binary_testing:
uses: ./.github/workflows/reusable_ici.yml
with:
ros_distro: humble
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/humble-semi-binary-main.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
name: Humble Semi Binary Build Main
on:
workflow_dispatch:
branches:
- humble
schedule:
# Run every morning to detect flakiness and broken dependencies
- cron: '03 5 * * *'


jobs:
binary:
humble_semi_main:
uses: ./.github/workflows/reusable_ici.yml
with:
ros_distro: humble
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/humble-semi-binary-testing.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
name: Humble Semi Binary Build Testing
on:
workflow_dispatch:
branches:
- humble
schedule:
# Run every morning to detect flakiness and broken dependencies
- cron: '03 5 * * *'


jobs:
binary:
humble_semi_testing:
uses: ./.github/workflows/reusable_ici.yml
with:
ros_distro: humble
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/iron-binary-main.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
name: Iron Binary Build Main
on:
workflow_dispatch:
branches:
- iron
pull_request:
branches:
- iron
Expand All @@ -14,7 +12,7 @@ on:
- cron: '13 5 * * *'

jobs:
binary:
iron_binary_main:
uses: ./.github/workflows/reusable_ici.yml
with:
ros_distro: iron
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/iron-binary-testing.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
name: Iron Binary Build Testing
on:
workflow_dispatch:
branches:
- iron
pull_request:
branches:
- iron
Expand All @@ -14,7 +12,7 @@ on:
- cron: '13 5 * * *'

jobs:
binary:
iron_binary_testing:
uses: ./.github/workflows/reusable_ici.yml
with:
ros_distro: iron
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/iron-semi-binary-main.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
name: Iron Semi Binary Build Main
on:
workflow_dispatch:
branches:
- iron
pull_request:
branches:
- iron
Expand All @@ -14,7 +12,7 @@ on:
- cron: '13 5 * * *'

jobs:
binary:
iron_semi_main:
uses: ./.github/workflows/reusable_ici.yml
with:
ros_distro: iron
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/iron-semi-binary-testing.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
name: Iron Semi Binary Build Testing
on:
workflow_dispatch:
branches:
- iron
pull_request:
branches:
- iron
Expand All @@ -14,7 +12,7 @@ on:
- cron: '13 5 * * *'

jobs:
binary:
iron_semi_testing:
uses: ./.github/workflows/reusable_ici.yml
with:
ros_distro: iron
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/jazzy-binary-main.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
name: Jazzy Binary Build Main
on:
workflow_dispatch:
branches:
- main
pull_request:
branches:
- main
Expand All @@ -14,7 +12,7 @@ on:
- cron: '13 4 * * *'

jobs:
binary:
jazzy_binary_main:
uses: ./.github/workflows/reusable_ici.yml
with:
ros_distro: jazzy
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/jazzy-binary-testing.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
name: Jazzy Binary Build Testing
on:
workflow_dispatch:
branches:
- main
pull_request:
branches:
- main
Expand All @@ -14,7 +12,7 @@ on:
- cron: '13 4 * * *'

jobs:
binary:
jazzy_binary_testing:
uses: ./.github/workflows/reusable_ici.yml
with:
ros_distro: jazzy
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/jazzy-semi-binary-main.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
name: Jazzy Semi Binary Build Main
on:
workflow_dispatch:
branches:
- main
pull_request:
branches:
- main
Expand All @@ -14,7 +12,7 @@ on:
- cron: '13 4 * * *'

jobs:
binary:
jazzy_semi_main:
uses: ./.github/workflows/reusable_ici.yml
with:
ros_distro: jazzy
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/jazzy-semi-binary-testing.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
name: Jazzy Semi Binary Build Testing
on:
workflow_dispatch:
branches:
- main
pull_request:
branches:
- main
Expand All @@ -14,7 +12,7 @@ on:
- cron: '13 4 * * *'

jobs:
binary:
jazzy_semi_testing:
uses: ./.github/workflows/reusable_ici.yml
with:
ros_distro: jazzy
Expand Down
22 changes: 19 additions & 3 deletions .github/workflows/reusable_ici.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,39 @@ on:
default: ''
required: false
type: string
ccache_dir:
description: 'CCache dir that should be used. Relative to github.workspace'
default: '.ccache'
required: false
type: string

jobs:
reusable_ici:
name: ${{ inputs.ros_distro }} ${{ inputs.ros_repo }} ${{ inputs.os_code_name }}
name: ${{ inputs.ros_distro }} ${{ inputs.ros_repo }}
runs-on: ubuntu-latest
env:
DOCKER_RUN_OPTS: '-v /var/run/docker.sock:/var/run/docker.sock --network ursim_net'
CCACHE_DIR: ${{ github.workspace }}/${{ inputs.ccache_dir }}
CACHE_PREFIX: ${{ inputs.ros_distro }}-${{ inputs.upstream_workspace }}-${{ inputs.ros_repo }}-${{ github.job }}
steps:
- name: Checkout ${{ inputs.ref }} when build is not scheduled
- name: Checkout ${{ github.ref_name }} since build is not scheduled
if: ${{ github.event_name != 'schedule' }}
uses: actions/checkout@v4
- name: Checkout ${{ inputs.ref }} on scheduled build
- name: Checkout ${{ inputs.ref_for_scheduled_build }} 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
if: ${{ !env.ACT }}
- name: Cache ccache
uses: actions/cache@v4
with:
path: ${{ env.CCACHE_DIR }}
key: ccache-${{ env.CACHE_PREFIX }}-${{ github.sha }}-${{ github.run_id }}
restore-keys: |
ccache-${{ env.CACHE_PREFIX }}-${{ github.sha }}
ccache-${{ env.CACHE_PREFIX }}
- uses: 'ros-industrial/industrial_ci@master'
env:
UPSTREAM_WORKSPACE: ${{ inputs.upstream_workspace }}
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/rolling-binary-main.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
name: Rolling Binary Build Main
on:
workflow_dispatch:
branches:
- main
pull_request:
branches:
- main
Expand All @@ -14,7 +12,7 @@ on:
- cron: '13 4 * * *'

jobs:
binary:
rolling_binary_main:
uses: ./.github/workflows/reusable_ici.yml
with:
ros_distro: rolling
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/rolling-binary-testing.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
name: Rolling Binary Build Testing
on:
workflow_dispatch:
branches:
- main
pull_request:
branches:
- main
Expand All @@ -14,7 +12,7 @@ on:
- cron: '13 4 * * *'

jobs:
binary:
rolling_binary_testing:
uses: ./.github/workflows/reusable_ici.yml
with:
ros_distro: rolling
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/rolling-semi-binary-main.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
name: Rolling Semi Binary Build Main
on:
workflow_dispatch:
branches:
- main
pull_request:
branches:
- main
Expand All @@ -14,7 +12,7 @@ on:
- cron: '13 4 * * *'

jobs:
binary:
rolling_semi_main:
uses: ./.github/workflows/reusable_ici.yml
with:
ros_distro: rolling
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/rolling-semi-binary-testing.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
name: Rolling Semi Binary Build Testing
on:
workflow_dispatch:
branches:
- main
pull_request:
branches:
- main
Expand All @@ -14,7 +12,7 @@ on:
- cron: '13 4 * * *'

jobs:
binary:
rolling_semi_testing:
uses: ./.github/workflows/reusable_ici.yml
with:
ros_distro: rolling
Expand Down
16 changes: 16 additions & 0 deletions Universal_Robots_ROS2_Driver.jazzy.repos
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,19 @@ repositories:
type: git
url: https://github.com/ros-controls/control_msgs.git
version: master
realtime_tools:
type: git
url: https://github.com/ros-controls/realtime_tools.git
version: master
moveit2:
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
srdfdom:
type: git
url: https://github.com/moveit/srdfdom.git
version: ros2
16 changes: 16 additions & 0 deletions Universal_Robots_ROS2_Driver.rolling.repos
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,19 @@ repositories:
type: git
url: https://github.com/ros-controls/control_msgs.git
version: master
realtime_tools:
type: git
url: https://github.com/ros-controls/realtime_tools.git
version: master
moveit2:
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
srdfdom:
type: git
url: https://github.com/moveit/srdfdom.git
version: ros2
Loading