Skip to content

Commit

Permalink
Update CI and remove Iron in favor of Jazzy
Browse files Browse the repository at this point in the history
  • Loading branch information
sea-bass committed Feb 9, 2025
1 parent 72e2f2c commit bff4e09
Show file tree
Hide file tree
Showing 16 changed files with 54 additions and 60 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci-coverage-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ on:
jobs:
coverage:
name: coverage build
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
strategy:
fail-fast: false
env:
ROS_DISTRO: rolling
steps:
- uses: ros-tooling/setup-ros@0.6.2
- uses: ros-tooling/setup-ros@v0.7
with:
required-ros-distributions: ${{ env.ROS_DISTRO }}
- uses: actions/checkout@v3
- uses: ros-tooling/action-ros-ci@0.3.2
- uses: actions/checkout@v4
- uses: ros-tooling/action-ros-ci@v0.3
with:
target-ros2-distro: ${{ env.ROS_DISTRO }}
import-token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -37,12 +37,12 @@ jobs:
}
}
colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml
- uses: codecov/codecov-action@v3.1.0
- uses: codecov/codecov-action@v5.3.1
with:
file: ros_ws/lcov/total_coverage.info
flags: unittests
name: codecov-umbrella
- uses: actions/upload-artifact@v3.1.0
- uses: actions/upload-artifact@v4
with:
name: colcon-logs-coverage-rolling
path: ros_ws/log
6 changes: 3 additions & 3 deletions .github/workflows/ci-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ jobs:
name: Format
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4.4.0
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.10'
- name: Install system hooks
run: sudo apt install -qq clang-format-14 cppcheck
- uses: pre-commit/action@v3.0.0
- uses: pre-commit/action@v3
with:
extra_args: --all-files --hook-stage manual
12 changes: 6 additions & 6 deletions .github/workflows/ci-ros-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ on:
jobs:
ament_lint:
name: ament_${{ matrix.linter }}
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
linter: [cppcheck, copyright, lint_cmake]
steps:
- uses: actions/checkout@v3
- uses: ros-tooling/setup-ros@0.6.2
- uses: actions/checkout@v4
- uses: ros-tooling/setup-ros@v0.7
- uses: ros-tooling/[email protected]
with:
distribution: rolling
Expand All @@ -23,14 +23,14 @@ jobs:

ament_lint_100:
name: ament_${{ matrix.linter }}
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
linter: [cpplint]
steps:
- uses: actions/checkout@v3
- uses: ros-tooling/setup-ros@0.6.2
- uses: actions/checkout@v4
- uses: ros-tooling/setup-ros@v0.7
- uses: ros-tooling/[email protected]
with:
distribution: rolling
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/humble-abi-compatibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
abi_check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ros-industrial/industrial_ci@master
env:
ROS_DISTRO: humble
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Iron - ABI Compatibility Check
name: Jazzy - ABI Compatibility Check
on:
workflow_dispatch:
branches:
Expand All @@ -11,10 +11,10 @@ jobs:
abi_check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ros-industrial/industrial_ci@master
env:
ROS_DISTRO: iron
ROS_DISTRO: jazzy
ROS_REPO: main
ABICHECK_URL: github:${{ github.repository }}#${{ github.base_ref }}
NOT_TEST_BUILD: true
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Iron Binary Build - main
name: Jazzy Binary Build - main
# author: Denis Štogl <[email protected]>
# description: 'Build & test all dependencies from released (binary) packages.'

Expand All @@ -20,7 +20,7 @@ jobs:
binary:
uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
with:
ros_distro: iron
ros_distro: jazzy
ros_repo: main
upstream_workspace: picknik_controllers-not-released.iron.repos
upstream_workspace: picknik_controllers-not-released.jazzy.repos
ref_for_scheduled_build: main
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Iron Binary Build - testing
name: Jazzy Binary Build - testing
# author: Denis Štogl <[email protected]>
# description: 'Build & test all dependencies from released (binary) packages.'

Expand All @@ -20,7 +20,7 @@ jobs:
binary:
uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
with:
ros_distro: iron
ros_distro: jazzy
ros_repo: testing
upstream_workspace: picknik_controllers-not-released.iron.repos
upstream_workspace: picknik_controllers-not-released.jazzy.repos
ref_for_scheduled_build: main
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Iron Semi-Binary Build - main
name: Jazzy Semi-Binary Build - main
# description: 'Build & test that compiles the main dependencies from source.'

on:
Expand All @@ -19,7 +19,7 @@ jobs:
semi_binary:
uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
with:
ros_distro: iron
ros_distro: jazzy
ros_repo: main
upstream_workspace: picknik_controllers.iron.repos
upstream_workspace: picknik_controllers.jazzy.repos
ref_for_scheduled_build: main
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Iron Semi-Binary Build - testing
name: Jazzy Semi-Binary Build - testing
# description: 'Build & test that compiles the main dependencies from source.'

on:
Expand All @@ -19,7 +19,7 @@ jobs:
semi_binary:
uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
with:
ros_distro: iron
ros_distro: jazzy
ros_repo: testing
upstream_workspace: picknik_controllers.iron.repos
upstream_workspace: picknik_controllers.jazzy.repos
ref_for_scheduled_build: main
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Iron Source Build
name: Jazzy Source Build
on:
workflow_dispatch:
branches:
Expand All @@ -14,6 +14,6 @@ jobs:
source:
uses: ./.github/workflows/reusable-ros-tooling-source-build.yml
with:
ros_distro: iron
ros_distro: jazzy
ref: main
ros2_repo_branch: iron
ros2_repo_branch: jazzy
10 changes: 2 additions & 8 deletions .github/workflows/prerelease-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,22 @@ on:
default: 'rolling'
type: choice
options:
- foxy
- galactic
- humble
- iron
- jazzy
- rolling
branch:
description: 'Chose branch for distro'
required: true
default: 'master'
type: choice
options:
- foxy
- galactic
- humble
- iron
- master

jobs:
pre_release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ github.event.inputs.branch }}
- name: industrial_ci
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/reusable-industrial-ci-with-cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,22 +58,22 @@ jobs:
steps:
- name: Checkout ${{ inputs.ref }} when build is not scheduled
if: ${{ github.event_name != 'schedule' }}
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Checkout ${{ inputs.ref }} on scheduled build
if: ${{ github.event_name == 'schedule' }}
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ inputs.ref_for_scheduled_build }}
- name: cache target_ws
if: ${{ ! matrix.env.CCOV }}
uses: pat-s/always-upload-cache@v2.1.5
uses: pat-s/always-upload-cache@v3
with:
path: ${{ env.BASEDIR }}/target_ws
key: target_ws-${{ env.CACHE_PREFIX }}-${{ hashFiles('**/CMakeLists.txt', '**/package.xml') }}-${{ github.run_id }}
restore-keys: |
target_ws-${{ env.CACHE_PREFIX }}-${{ hashFiles('**/CMakeLists.txt', '**/package.xml') }}
- name: cache ccache
uses: pat-s/always-upload-cache@v2.1.5
uses: pat-s/always-upload-cache@v3
with:
path: ${{ env.CCACHE_DIR }}
key: ccache-${{ env.CACHE_PREFIX }}-${{ github.sha }}-${{ github.run_id }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/reusable-ros-tooling-source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,25 @@ on:
required: true
type: string
ros2_repo_branch:
description: 'Branch in the ros2/ros2 repository from which ".repos" should be used. Possible values: master (Rolling), humble, iron, galactic, foxy.'
description: 'Branch in the ros2/ros2 repository from which ".repos" should be used. Possible values: master (Rolling), humble, jazzy.'
default: 'master'
required: false
type: string

jobs:
reusable_ros_tooling_source_build:
name: ${{ inputs.ros_distro }} ubuntu-22.04
runs-on: ubuntu-22.04
name: ${{ inputs.ros_distro }} ubuntu-24.04
runs-on: ubuntu-24.04
strategy:
fail-fast: false
steps:
- uses: ros-tooling/setup-ros@0.6.2
- uses: ros-tooling/setup-ros@v0.7
with:
required-ros-distributions: ${{ inputs.ros_distro }}
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ inputs.ref }}
- uses: ros-tooling/action-ros-ci@0.3.2
- uses: ros-tooling/action-ros-ci@v0.3
with:
target-ros2-distro: ${{ inputs.ros_distro }}
# build all packages listed in the meta package
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rolling-abi-compatibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
abi_check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ros-industrial/industrial_ci@master
env:
ROS_DISTRO: rolling
Expand Down
14 changes: 7 additions & 7 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ repos:

# Standard hooks
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v5.0.0
hooks:
- id: check-added-large-files
- id: check-ast
Expand All @@ -44,7 +44,7 @@ repos:

# Python hooks
- repo: https://github.com/asottile/pyupgrade
rev: v3.7.0
rev: v3.19.1
hooks:
- id: pyupgrade
args: [--py36-plus]
Expand All @@ -56,21 +56,21 @@ repos:
args: ["--ignore=D100,D101,D102,D103,D104,D105,D106,D107,D203,D212,D404"]

- repo: https://github.com/pycqa/flake8
rev: 6.0.0
rev: 7.1.1
hooks:
- id: flake8
args: ["--extend-ignore=E501"]

- repo: https://github.com/psf/black
rev: 23.3.0
rev: 25.1.0
hooks:
- id: black
args: ["--line-length=99"]


# CPP hooks
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v16.0.6
rev: v19.1.7
hooks:
- id: clang-format

Expand Down Expand Up @@ -119,7 +119,7 @@ repos:

# Docs - RestructuredText hooks
- repo: https://github.com/PyCQA/doc8
rev: v1.1.1
rev: v1.1.2
hooks:
- id: doc8
args: ['--max-line-length=100', '--ignore=D001']
Expand All @@ -136,7 +136,7 @@ repos:
# Spellcheck in comments and docs
# skipping of *.svg files is not working...
- repo: https://github.com/codespell-project/codespell
rev: v2.2.5
rev: v2.4.1
hooks:
- id: codespell
args: ['--ignore-words=.codespell-ignore-words.txt', '--write-changes']
Expand Down
File renamed without changes.

0 comments on commit bff4e09

Please sign in to comment.