Skip to content

Commit d5b0319

Browse files
committed
iox-#1755 Use v18 of clang-format and clang-tidy
1 parent 325dea7 commit d5b0319

File tree

8 files changed

+28
-28
lines changed

8 files changed

+28
-28
lines changed

.cirrus.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ iox_run_tests_template: &IOX_RUN_TESTS
103103

104104
preflight_check_task:
105105
container:
106-
dockerfile: tools/ci/docker/ubuntu-22.04
106+
dockerfile: tools/ci/docker/ubuntu-24.04
107107
cpu: 1
108108
memory: 4GB
109109
<<: *IOX_TASK_TIMEOUT
@@ -114,13 +114,13 @@ preflight_check_task:
114114
cmake_linter_script: tools/ci/cmake-linter.sh
115115

116116
#
117-
# Ubuntu 22.04 aarch64
117+
# Ubuntu 24.04 aarch64
118118
#
119119

120120
ubuntu_22_04_aarch64_build_task:
121121
depends_on: preflight_check
122122
arm_container:
123-
dockerfile: tools/ci/docker/ubuntu-22.04
123+
dockerfile: tools/ci/docker/ubuntu-24.04
124124
<<: *IOX_COMMON_CPU_AND_MEMORY_CONFIG_FOR_BUILDS
125125
<<: *IOX_TASK_TIMEOUT
126126
test_binaries_cache:
@@ -135,7 +135,7 @@ ubuntu_22_04_aarch64_build_task:
135135
ubuntu_22_04_aarch64_test_task:
136136
depends_on: ubuntu_22_04_aarch64_build
137137
arm_container:
138-
dockerfile: tools/ci/docker/ubuntu-22.04
138+
dockerfile: tools/ci/docker/ubuntu-24.04
139139
<<: *IOX_COMMON_CPU_AND_MEMORY_CONFIG_FOR_TESTS
140140
<<: *IOX_TASK_TIMEOUT
141141
test_binaries_cache:

.github/actions/install-iceoryx-deps-and-clang/action.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ runs:
77
run: |
88
sudo dpkg --add-architecture i386
99
sudo wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
10-
sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main"
10+
sudo add-apt-repository "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-18 main"
1111
sudo apt-get update
1212
sudo apt-get install -y libacl1-dev libncurses5-dev
1313
sudo apt-get install -y libacl1-dev:i386 libc6-dev-i386 libc6-dev-i386-cross libstdc++6-i386-cross gcc-multilib g++-multilib
14-
sudo apt-get install -y clang-format-15 clang-tidy-15 clang-tools-15 clang-15 lld
14+
sudo apt-get install -y clang-format-18 clang-tidy-18 clang-tools-18 clang-18 lld
1515
sudo rm /usr/bin/clang
1616
sudo rm /usr/bin/clang++
1717
sudo rm /usr/bin/clang-tidy
1818
sudo rm /usr/bin/clang-format
19-
sudo ln -s /usr/bin/clang-15 /usr/bin/clang
20-
sudo ln -s /usr/bin/clang++-15 /usr/bin/clang++
21-
sudo ln -s /usr/bin/clang-tidy-15 /usr/bin/clang-tidy
22-
sudo ln -s /usr/bin/clang-format-15 /usr/bin/clang-format
19+
sudo ln -s /usr/bin/clang-18 /usr/bin/clang
20+
sudo ln -s /usr/bin/clang++-18 /usr/bin/clang++
21+
sudo ln -s /usr/bin/clang-tidy-18 /usr/bin/clang-tidy
22+
sudo ln -s /usr/bin/clang-format-18 /usr/bin/clang-format

.github/workflows/build-test.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
pre-flight-check:
1414
# prevent stuck jobs consuming runners for 6 hours
1515
timeout-minutes: 60
16-
runs-on: ubuntu-latest
16+
runs-on: ubuntu-24.04
1717
steps:
1818
- uses: actions/checkout@v4
1919
- name: Install iceoryx dependencies and clang-tidy
@@ -25,7 +25,7 @@ jobs:
2525
- run: ./tools/ci/cmake-linter.sh
2626

2727
check-status-of-nightly-action:
28-
runs-on: ubuntu-latest
28+
runs-on: ubuntu-24.04
2929
needs: pre-flight-check
3030
steps:
3131
- name: Install dependencies
@@ -102,7 +102,7 @@ jobs:
102102
# prevent stuck jobs consuming runners for 6 hours
103103
timeout-minutes: 60
104104
needs: pre-flight-check
105-
runs-on: ubuntu-latest
105+
runs-on: ubuntu-24.04
106106
steps:
107107
- uses: actions/checkout@v4
108108
- name: Unix (FreeBSD) test
@@ -132,7 +132,7 @@ jobs:
132132
build-test-ubuntu-with-address-sanitizer-gcc-latest:
133133
# prevent stuck jobs consuming runners for 1 hour
134134
timeout-minutes: 60
135-
runs-on: ubuntu-latest
135+
runs-on: ubuntu-24.04
136136
needs: pre-flight-check
137137
steps:
138138
- uses: egor-tensin/[email protected]
@@ -146,7 +146,7 @@ jobs:
146146
build-test-ubuntu-with-address-sanitizer-clang-latest:
147147
# prevent stuck jobs consuming runners for 1 hour
148148
timeout-minutes: 60
149-
runs-on: ubuntu-latest
149+
runs-on: ubuntu-24.04
150150
needs: pre-flight-check
151151
steps:
152152
- name: Checkout
@@ -169,7 +169,7 @@ jobs:
169169
build-test-ubuntu-with-thread-sanitizer-clang-latest:
170170
# prevent stuck jobs consuming runners for 3 hours
171171
timeout-minutes: 180
172-
runs-on: ubuntu-latest
172+
runs-on: ubuntu-24.04
173173
needs: pre-flight-check
174174
steps:
175175
- name: Checkout
@@ -182,7 +182,7 @@ jobs:
182182
build-test-ubuntu-32-bit:
183183
# prevent stuck jobs consuming runners for 6 hours
184184
timeout-minutes: 60
185-
runs-on: ubuntu-latest
185+
runs-on: ubuntu-24.04
186186
needs: pre-flight-check
187187
steps:
188188
- name: Checkout
@@ -204,7 +204,7 @@ jobs:
204204
build-test-ubuntu-32-64-bit-mix-mode:
205205
# prevent stuck jobs consuming runners for 6 hours
206206
timeout-minutes: 60
207-
runs-on: ubuntu-latest
207+
runs-on: ubuntu-24.04
208208
needs: pre-flight-check
209209
steps:
210210
- name: Checkout
@@ -217,7 +217,7 @@ jobs:
217217
build-test-ubuntu-bazel:
218218
# prevent stuck jobs consuming runners for 6 hours
219219
timeout-minutes: 60
220-
runs-on: ubuntu-latest
220+
runs-on: ubuntu-24.04
221221
needs: pre-flight-check
222222
steps:
223223
- name: Checkout

.github/workflows/lint_pull_request.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
jobs:
88
clang-tidy-review:
9-
runs-on: ubuntu-latest
9+
runs-on: ubuntu-24.04
1010

1111
steps:
1212
- name: Checkout
@@ -24,7 +24,7 @@ jobs:
2424
run: ./tools/scripts/clang_tidy_check.sh scan_list .clang-tidy-diff-scans.txt "${{ steps.changed_files.outputs.added_modified }}"
2525

2626
check-for-todo:
27-
runs-on: ubuntu-latest
27+
runs-on: ubuntu-24.04
2828

2929
steps:
3030
- name: Checkout
@@ -36,7 +36,7 @@ jobs:
3636
run: ./tools/ci/todo-verificator.sh
3737

3838
verify-links-in-markdown-documentation:
39-
runs-on: ubuntu-latest
39+
runs-on: ubuntu-24.04
4040
steps:
4141
- uses: actions/checkout@v4
4242

.github/workflows/nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- run: ./tools/ci/build-test-macos.sh
1616

1717
clang-tidy-full-scan:
18-
runs-on: ubuntu-latest
18+
runs-on: ubuntu-24.04
1919

2020
steps:
2121
- name: Checkout

tools/ci/docker/ubuntu-22.04 renamed to tools/ci/docker/ubuntu-24.04

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# syntax=docker/dockerfile:1
22

33
# Select base image
4-
FROM ubuntu:22.04
4+
FROM ubuntu:24.04
55

66
# Disable prompt during packages installation
77
ARG DEBIAN_FRONTEND=noninteractive
@@ -11,8 +11,8 @@ ARG DEBIAN_FRONTEND=noninteractive
1111
# Install additional packages
1212
RUN apt update && apt install -y \
1313
clang \
14-
clang-format-15 \
15-
clang-tidy-15 \
14+
clang-format-18 \
15+
clang-tidy-18 \
1616
cmake \
1717
g++ \
1818
git \

tools/scripts/clang_format.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ fail() {
2929
hash git || fail "git not found"
3030

3131
# Check if we have at least a specific clang-format version installed
32-
CLANG_FORMAT_VERSION=12
32+
CLANG_FORMAT_VERSION=18
3333
CLANG_FORMAT_CMD="clang-format-$CLANG_FORMAT_VERSION"
3434
if ! command -v $CLANG_FORMAT_CMD &> /dev/null
3535
then

tools/scripts/clang_tidy_check.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ fail() {
3636
exit 1
3737
}
3838

39-
CLANG_TIDY_VERSION=15
39+
CLANG_TIDY_VERSION=18
4040
CLANG_TIDY_CMD="clang-tidy-$CLANG_TIDY_VERSION"
4141
if ! command -v $CLANG_TIDY_CMD &> /dev/null
4242
then

0 commit comments

Comments
 (0)