Skip to content

Commit cd0ab88

Browse files
committed
CI: Add Noble build
1 parent 8c0609a commit cd0ab88

File tree

4 files changed

+12
-14
lines changed

4 files changed

+12
-14
lines changed

.github/workflows/ci.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ jobs:
1919
fail-fast: false
2020
matrix:
2121
env:
22-
- IMAGE: jammy-ci
23-
- IMAGE: noetic-source
22+
- IMAGE: noble-ci
2423
NAME: ccov
2524
TARGET_CMAKE_ARGS: -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS="--coverage"
26-
- IMAGE: noetic-source
25+
- IMAGE: noble-ci
2726
CLANG_TIDY: true
2827
TARGET_CMAKE_ARGS: >-
2928
-DCMAKE_BUILD_TYPE=Release
3029
-DCMAKE_CXX_FLAGS="-Werror -Wall -Wextra -Wwrite-strings -Wunreachable-code -Wpointer-arith -Wredundant-decls -Wold-style-cast"
30+
- IMAGE: jammy-ci
3131
- IMAGE: noetic-source
3232
NAME: asan
3333
DOCKER_RUN_OPTS: >-
@@ -39,15 +39,15 @@ jobs:
3939
CATKIN_LINT: true
4040
CLANG_TIDY_ARGS: -quiet -export-fixes ${{ github.workspace }}/.work/clang-tidy-fixes.yaml
4141
DOCKER_IMAGE: moveit/moveit:${{ matrix.env.IMAGE }}
42-
UNDERLAY: ${{ matrix.env.IMAGE != 'jammy-ci' && '/root/ws_moveit/install' || '' }}
42+
UNDERLAY: ${{ endsWith(matrix.env.IMAGE, '-source') && '/root/ws_moveit/install' || '' }}
4343
DOWNSTREAM_WORKSPACE: "github:ubi-agni/mtc_demos#master"
4444
CCACHE_DIR: ${{ github.workspace }}/.ccache
4545
BASEDIR: ${{ github.workspace }}/.work
4646
CACHE_PREFIX: "${{ matrix.env.IMAGE }}${{ contains(matrix.env.TARGET_CMAKE_ARGS, '--coverage') && '-ccov' || '' }}"
4747
# perform full clang-tidy check only on manual trigger (workflow_dispatch), PRs do check changed files, otherwise nothing
4848
CLANG_TIDY_BASE_REF: ${{ github.event_name != 'workflow_dispatch' && (github.base_ref || github.ref) || '' }}
4949
CC: ${{ matrix.env.CLANG_TIDY && 'clang' }}
50-
CXX: ${{ matrix.env.CLANG_TIDY && 'clang++' }}
50+
CXX: ${{ matrix.env.CLANG_TIDY && 'clang++ -std=c++17' }}
5151

5252
name: "${{ matrix.env.IMAGE }}${{ matrix.env.NAME && ' • ' || ''}}${{ matrix.env.NAME }}${{ matrix.env.CATKIN_LINT && ' • catkin_lint' || ''}}${{ matrix.env.CLANG_TIDY && ' • clang-tidy' || '' }}"
5353
runs-on: ubuntu-latest

.github/workflows/format.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ on:
1111
jobs:
1212
pre-commit:
1313
name: pre-commit
14-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/checkout@v4
1717
with:
1818
submodules: recursive
19-
- name: Install clang-format-12
20-
run: sudo apt-get install clang-format-12
21-
- uses: rhaschke/install-catkin_lint-action@v1.0
19+
- name: Install clang-format-14
20+
run: sudo apt-get install clang-format-14
21+
- uses: rhaschke/install-catkin_lint-action@main
2222
with:
2323
distro: noetic
2424
- uses: pre-commit/[email protected]

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
repos:
1616
# Standard hooks
1717
- repo: https://github.com/pre-commit/pre-commit-hooks
18-
rev: v4.6.0
18+
rev: v5.0.0
1919
hooks:
2020
- id: check-added-large-files
2121
- id: check-case-conflict
@@ -29,7 +29,7 @@ repos:
2929
- id: trailing-whitespace
3030

3131
- repo: https://github.com/psf/black
32-
rev: 24.8.0
32+
rev: 24.10.0
3333
hooks:
3434
- id: black
3535
args: ["--line-length", "100"]
@@ -39,7 +39,7 @@ repos:
3939
- id: clang-format
4040
name: clang-format
4141
description: Format files with ClangFormat.
42-
entry: clang-format-12
42+
entry: clang-format-14
4343
language: system
4444
files: \.(c|cc|cxx|cpp|frag|glsl|h|hpp|hxx|ih|ispc|ipp|java|js|m|proto|vert)$
4545
args: ["-fallback-style=none", "-i"]

core/src/stages/predicate_filter.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,6 @@ void PredicateFilter::init(const moveit::core::RobotModelConstPtr& robot_model)
8080
void PredicateFilter::onNewSolution(const SolutionBase& s) {
8181
const auto& props = properties();
8282

83-
// false-positive in clang-tidy 10.0.0: predicate might change comment
84-
// NOLINTNEXTLINE(performance-unnecessary-copy-initialization)
8583
std::string comment = s.comment();
8684

8785
double cost = s.cost();

0 commit comments

Comments
 (0)