Skip to content

Commit aa344e8

Browse files
committed
Merge branch 'main' into ros2
2 parents 8893f94 + 4acdc53 commit aa344e8

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
distro: [humble, rolling]
21+
distro: [jazzy, rolling]
2222
include:
23-
- distro: humble
23+
- distro: jazzy
2424
env:
2525
CLANG_TIDY: true
2626
TARGET_CMAKE_ARGS: >-
@@ -44,7 +44,7 @@ jobs:
4444
name: "${{ matrix.distro }}${{ matrix.env.NAME && ' • ' || ''}}${{ matrix.env.NAME }}${{ matrix.env.CLANG_TIDY && ' • clang-tidy' || '' }}"
4545
runs-on: ubuntu-latest
4646
steps:
47-
- uses: actions/checkout@v4
47+
- uses: actions/checkout@v6
4848

4949
- name: Cache ccache
5050
uses: rhaschke/cache@main
@@ -62,7 +62,7 @@ jobs:
6262
uses: rhaschke/industrial_ci@master
6363

6464
- name: Upload clang-tidy fixes (on failure)
65-
uses: actions/upload-artifact@v4
65+
uses: actions/upload-artifact@v7
6666
if: failure() && steps.ici.outputs.clang_tidy_checks
6767
with:
6868
name: clang-tidy-fixes.yaml

.github/workflows/format.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
name: pre-commit
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v4
16+
- uses: actions/checkout@v6
1717
with:
1818
submodules: recursive
1919
- name: Install clang-format

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ repos:
2929
- id: trailing-whitespace
3030

3131
- repo: https://github.com/psf/black
32-
rev: 25.1.0
32+
rev: 26.3.1
3333
hooks:
3434
- id: black
3535
args: ["--line-length", "100"]

0 commit comments

Comments
 (0)