Skip to content

Commit c0a9e53

Browse files
dependabot[bot]mergify[bot]
dependabot[bot]
authored and
mergify[bot]
committed
Bump actions/checkout from 4 to 5 (#1479)
(cherry picked from commit 0c8d0fc) # Conflicts: # .github/workflows/ci-format.yml # .github/workflows/coverage-build.yml # .github/workflows/foxy-binary-build.yml # .github/workflows/galactic-binary-build.yml # .github/workflows/reusable_ici.yml # .github/workflows/update-ci.yml
1 parent 26c87b4 commit c0a9e53

File tree

7 files changed

+187
-1
lines changed

7 files changed

+187
-1
lines changed

‎.github/workflows/check_links.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
check_links:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v4
13+
- uses: actions/checkout@v5
1414
- name: Restore lychee cache
1515
id: restore-cache
1616
uses: actions/cache/restore@v4

‎.github/workflows/ci-format.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ jobs:
1515
name: Format
1616
runs-on: ubuntu-22.04
1717
steps:
18+
<<<<<<< HEAD
1819
- uses: actions/checkout@v4
1920
- uses: actions/setup-python@v6
2021
with:
@@ -24,3 +25,14 @@ jobs:
2425
- uses: pre-commit/[email protected]
2526
with:
2627
extra_args: --all-files --hook-stage manual
28+
=======
29+
- uses: actions/checkout@v5
30+
- uses: actions/setup-python@v6
31+
with:
32+
python-version: 3.10.4
33+
- name: Install system hooks
34+
run: sudo apt-get install clang-format-14 cppcheck
35+
- uses: pre-commit/[email protected]
36+
with:
37+
extra_args: --all-files --hook-stage manual
38+
>>>>>>> 0c8d0fc (Bump actions/checkout from 4 to 5 (#1479))

‎.github/workflows/coverage-build.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,14 @@ jobs:
1919
- uses: ros-tooling/[email protected]
2020
with:
2121
required-ros-distributions: ${{ env.ROS_DISTRO }}
22+
<<<<<<< HEAD
2223
- uses: actions/checkout@v2
2324
- uses: ros-tooling/[email protected]
25+
=======
26+
use-ros2-testing: true
27+
- uses: actions/checkout@v5
28+
- uses: ros-tooling/[email protected]
29+
>>>>>>> 0c8d0fc (Bump actions/checkout from 4 to 5 (#1479))
2430
with:
2531
target-ros2-distro: ${{ env.ROS_DISTRO }}
2632
# build all packages listed in the meta package

‎.github/workflows/foxy-binary-build.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Foxy Binary Build
2+
on:
3+
schedule:
4+
# Run every morning to detect flakiness and broken dependencies
5+
- cron: '58 11 * * *'
6+
7+
jobs:
8+
foxy_binary:
9+
name: foxy binary build
10+
runs-on: ubuntu-latest
11+
strategy:
12+
max-parallel: 1
13+
matrix:
14+
env:
15+
- {ROS_DISTRO: foxy, ROS_REPO: main}
16+
- {ROS_DISTRO: foxy, ROS_REPO: testing}
17+
env:
18+
DOCKER_RUN_OPTS: --network static_test_net
19+
BEFORE_INIT: 'apt-get update -qq && apt-get install -y iproute2 iputils-ping && ip addr && ping -c5 192.168.56.101'
20+
IMMEDIATE_TEST_OUTPUT: true
21+
steps:
22+
- uses: actions/checkout@v5
23+
with:
24+
ref: foxy
25+
- name: start ursim
26+
run: |
27+
.github/dockerursim/build_and_run_docker_ursim.sh
28+
- uses: 'ros-industrial/industrial_ci@master'
29+
env: ${{matrix.env}}

‎.github/workflows/galactic-binary-build.yml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Galactic Binary Build
2+
on:
3+
schedule:
4+
# Run every morning to detect flakiness and broken dependencies
5+
- cron: '03 4 * * *'
6+
7+
jobs:
8+
galactic_binary:
9+
name: galactic binary build
10+
runs-on: ubuntu-latest
11+
strategy:
12+
fail-fast: false
13+
matrix:
14+
ROS_DISTRO: [galactic]
15+
ROS_REPO: [main, testing]
16+
env:
17+
NOT_TEST_BUILD: true
18+
NOT_TEST_DOWNSTREAM: true
19+
steps:
20+
- uses: actions/checkout@v5
21+
with:
22+
ref: galactic
23+
- uses: 'ros-industrial/industrial_ci@master'
24+
env:
25+
ROS_DISTRO: ${{ matrix.ROS_DISTRO }}
26+
ROS_REPO: ${{ matrix.ROS_REPO }}

‎.github/workflows/reusable_ici.yml‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
name: Reusable industrial_ci workflow
2+
# original author: Denis Štogl <[email protected]>
3+
4+
on:
5+
workflow_call:
6+
inputs:
7+
ref_for_scheduled_build:
8+
description: 'Reference on which the repo should be checkout for scheduled build. Usually is this name of a branch or a tag.'
9+
default: ''
10+
required: false
11+
type: string
12+
13+
upstream_workspace:
14+
description: 'UPSTREAM_WORKSPACE variable for industrial_ci. Usually path to local .repos file.'
15+
required: false
16+
default: ''
17+
type: string
18+
ros_distro:
19+
description: 'ROS_DISTRO variable for industrial_ci'
20+
required: true
21+
type: string
22+
ros_repo:
23+
description: 'ROS_REPO to run for industrial_ci. Possible values: "main", "testing"'
24+
default: 'main'
25+
required: false
26+
type: string
27+
before_install_upstream_dependencies:
28+
description: 'BEFORE_INSTALL_UPSTREAM_DEPENDENCIES variable for industrial_ci'
29+
default: ''
30+
required: false
31+
type: string
32+
ccache_dir:
33+
description: 'CCache dir that should be used. Relative to github.workspace'
34+
default: '.ccache'
35+
required: false
36+
type: string
37+
38+
jobs:
39+
reusable_ici:
40+
name: ${{ inputs.ros_distro }} ${{ inputs.ros_repo }}
41+
runs-on: ubuntu-latest
42+
env:
43+
DOCKER_RUN_OPTS: '-v /var/run/docker.sock:/var/run/docker.sock --network ursim_net'
44+
CCACHE_DIR: ${{ github.workspace }}/${{ inputs.ccache_dir }}
45+
CACHE_PREFIX: ${{ inputs.ros_distro }}-${{ inputs.upstream_workspace }}-${{ inputs.ros_repo }}
46+
steps:
47+
- name: Checkout ${{ github.ref_name }} since build is not scheduled
48+
if: ${{ github.event_name != 'schedule' }}
49+
uses: actions/checkout@v5
50+
- name: Checkout ${{ inputs.ref_for_scheduled_build }} on scheduled build
51+
if: ${{ github.event_name == 'schedule' }}
52+
uses: actions/checkout@v5
53+
with:
54+
ref: ${{ inputs.ref_for_scheduled_build }}
55+
- run: docker network create --subnet=192.168.56.0/24 ursim_net
56+
if: ${{ !env.ACT }}
57+
- name: Cache ccache
58+
uses: actions/cache@v4
59+
with:
60+
path: ${{ env.CCACHE_DIR }}
61+
key: ccache-${{ env.CACHE_PREFIX }}-${{ github.sha }}-${{ github.run_id }}
62+
restore-keys: |
63+
ccache-${{ env.CACHE_PREFIX }}-${{ github.sha }}
64+
ccache-${{ env.CACHE_PREFIX }}
65+
- uses: 'ros-industrial/industrial_ci@master'
66+
env:
67+
UPSTREAM_WORKSPACE: ${{ inputs.upstream_workspace }}
68+
ROS_DISTRO: ${{ inputs.ros_distro }}
69+
ROS_REPO: ${{ inputs.ros_repo }}
70+
CMAKE_ARGS: -DUR_ROBOT_DRIVER_BUILD_INTEGRATION_TESTS=ON
71+
ADDITIONAL_DEBS: docker.io netcat-openbsd # Needed for integration tests

‎.github/workflows/update-ci.yml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# Auto-update CI tools regularly
2+
3+
name: CI auto-update
4+
5+
on:
6+
schedule:
7+
# Run weekly
8+
- cron: '23 5 * * 0'
9+
workflow_dispatch:
10+
11+
jobs:
12+
ci_auto_update:
13+
name: CI auto-update
14+
runs-on: ubuntu-latest
15+
steps:
16+
# Setup pre-commit
17+
- uses: actions/checkout@v5
18+
- uses: actions/setup-python@v6
19+
with:
20+
python-version: 3.10.4
21+
- name: Install pre-commit
22+
run: pip install pre-commit
23+
24+
# Run update
25+
- name: Run pre-commit autoupdate
26+
run: pre-commit autoupdate
27+
28+
# Create pull request
29+
- name: Create pull-request
30+
id: cpr
31+
uses: peter-evans/create-pull-request@v7
32+
with:
33+
branch: update-ci/pre-commit-autoupdate
34+
delete-branch: true
35+
title: Auto-update pre-commit hooks
36+
committer: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
37+
author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
38+
commit-message: Auto-update pre-commit hooks
39+
labels: CI
40+
- name: Check outputs
41+
if: ${{ steps.cpr.pull-request-number }}
42+
run: echo "Opened pull request ${{ steps.cpr.outputs.pull-request-number }} - ${{ steps.cpr.outputs.pull-request-url }}"

0 commit comments

Comments
 (0)