Skip to content

Commit

Permalink
iox-eclipse-iceoryx#1755 Use v18 of clang-format and clang-tidy
Browse files Browse the repository at this point in the history
  • Loading branch information
elBoberido committed Jan 8, 2025
1 parent 325dea7 commit d5b0319
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 28 deletions.
8 changes: 4 additions & 4 deletions .cirrus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ iox_run_tests_template: &IOX_RUN_TESTS

preflight_check_task:
container:
dockerfile: tools/ci/docker/ubuntu-22.04
dockerfile: tools/ci/docker/ubuntu-24.04
cpu: 1
memory: 4GB
<<: *IOX_TASK_TIMEOUT
Expand All @@ -114,13 +114,13 @@ preflight_check_task:
cmake_linter_script: tools/ci/cmake-linter.sh

#
# Ubuntu 22.04 aarch64
# Ubuntu 24.04 aarch64
#

ubuntu_22_04_aarch64_build_task:
depends_on: preflight_check
arm_container:
dockerfile: tools/ci/docker/ubuntu-22.04
dockerfile: tools/ci/docker/ubuntu-24.04
<<: *IOX_COMMON_CPU_AND_MEMORY_CONFIG_FOR_BUILDS
<<: *IOX_TASK_TIMEOUT
test_binaries_cache:
Expand All @@ -135,7 +135,7 @@ ubuntu_22_04_aarch64_build_task:
ubuntu_22_04_aarch64_test_task:
depends_on: ubuntu_22_04_aarch64_build
arm_container:
dockerfile: tools/ci/docker/ubuntu-22.04
dockerfile: tools/ci/docker/ubuntu-24.04
<<: *IOX_COMMON_CPU_AND_MEMORY_CONFIG_FOR_TESTS
<<: *IOX_TASK_TIMEOUT
test_binaries_cache:
Expand Down
12 changes: 6 additions & 6 deletions .github/actions/install-iceoryx-deps-and-clang/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ runs:
run: |
sudo dpkg --add-architecture i386
sudo wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main"
sudo add-apt-repository "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-18 main"
sudo apt-get update
sudo apt-get install -y libacl1-dev libncurses5-dev
sudo apt-get install -y libacl1-dev:i386 libc6-dev-i386 libc6-dev-i386-cross libstdc++6-i386-cross gcc-multilib g++-multilib
sudo apt-get install -y clang-format-15 clang-tidy-15 clang-tools-15 clang-15 lld
sudo apt-get install -y clang-format-18 clang-tidy-18 clang-tools-18 clang-18 lld
sudo rm /usr/bin/clang
sudo rm /usr/bin/clang++
sudo rm /usr/bin/clang-tidy
sudo rm /usr/bin/clang-format
sudo ln -s /usr/bin/clang-15 /usr/bin/clang
sudo ln -s /usr/bin/clang++-15 /usr/bin/clang++
sudo ln -s /usr/bin/clang-tidy-15 /usr/bin/clang-tidy
sudo ln -s /usr/bin/clang-format-15 /usr/bin/clang-format
sudo ln -s /usr/bin/clang-18 /usr/bin/clang
sudo ln -s /usr/bin/clang++-18 /usr/bin/clang++
sudo ln -s /usr/bin/clang-tidy-18 /usr/bin/clang-tidy
sudo ln -s /usr/bin/clang-format-18 /usr/bin/clang-format
18 changes: 9 additions & 9 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
pre-flight-check:
# prevent stuck jobs consuming runners for 6 hours
timeout-minutes: 60
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Install iceoryx dependencies and clang-tidy
Expand All @@ -25,7 +25,7 @@ jobs:
- run: ./tools/ci/cmake-linter.sh

check-status-of-nightly-action:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: pre-flight-check
steps:
- name: Install dependencies
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:
# prevent stuck jobs consuming runners for 6 hours
timeout-minutes: 60
needs: pre-flight-check
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Unix (FreeBSD) test
Expand Down Expand Up @@ -132,7 +132,7 @@ jobs:
build-test-ubuntu-with-address-sanitizer-gcc-latest:
# prevent stuck jobs consuming runners for 1 hour
timeout-minutes: 60
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: pre-flight-check
steps:
- uses: egor-tensin/[email protected]
Expand All @@ -146,7 +146,7 @@ jobs:
build-test-ubuntu-with-address-sanitizer-clang-latest:
# prevent stuck jobs consuming runners for 1 hour
timeout-minutes: 60
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: pre-flight-check
steps:
- name: Checkout
Expand All @@ -169,7 +169,7 @@ jobs:
build-test-ubuntu-with-thread-sanitizer-clang-latest:
# prevent stuck jobs consuming runners for 3 hours
timeout-minutes: 180
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: pre-flight-check
steps:
- name: Checkout
Expand All @@ -182,7 +182,7 @@ jobs:
build-test-ubuntu-32-bit:
# prevent stuck jobs consuming runners for 6 hours
timeout-minutes: 60
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: pre-flight-check
steps:
- name: Checkout
Expand All @@ -204,7 +204,7 @@ jobs:
build-test-ubuntu-32-64-bit-mix-mode:
# prevent stuck jobs consuming runners for 6 hours
timeout-minutes: 60
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: pre-flight-check
steps:
- name: Checkout
Expand All @@ -217,7 +217,7 @@ jobs:
build-test-ubuntu-bazel:
# prevent stuck jobs consuming runners for 6 hours
timeout-minutes: 60
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: pre-flight-check
steps:
- name: Checkout
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint_pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
clang-tidy-review:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04

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

check-for-todo:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04

steps:
- name: Checkout
Expand All @@ -36,7 +36,7 @@ jobs:
run: ./tools/ci/todo-verificator.sh

verify-links-in-markdown-documentation:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- run: ./tools/ci/build-test-macos.sh

clang-tidy-full-scan:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04

steps:
- name: Checkout
Expand Down
6 changes: 3 additions & 3 deletions tools/ci/docker/ubuntu-22.04 → tools/ci/docker/ubuntu-24.04
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1

# Select base image
FROM ubuntu:22.04
FROM ubuntu:24.04

# Disable prompt during packages installation
ARG DEBIAN_FRONTEND=noninteractive
Expand All @@ -11,8 +11,8 @@ ARG DEBIAN_FRONTEND=noninteractive
# Install additional packages
RUN apt update && apt install -y \
clang \
clang-format-15 \
clang-tidy-15 \
clang-format-18 \
clang-tidy-18 \
cmake \
g++ \
git \
Expand Down
2 changes: 1 addition & 1 deletion tools/scripts/clang_format.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ fail() {
hash git || fail "git not found"

# Check if we have at least a specific clang-format version installed
CLANG_FORMAT_VERSION=12
CLANG_FORMAT_VERSION=18
CLANG_FORMAT_CMD="clang-format-$CLANG_FORMAT_VERSION"
if ! command -v $CLANG_FORMAT_CMD &> /dev/null
then
Expand Down
2 changes: 1 addition & 1 deletion tools/scripts/clang_tidy_check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ fail() {
exit 1
}

CLANG_TIDY_VERSION=15
CLANG_TIDY_VERSION=18
CLANG_TIDY_CMD="clang-tidy-$CLANG_TIDY_VERSION"
if ! command -v $CLANG_TIDY_CMD &> /dev/null
then
Expand Down

0 comments on commit d5b0319

Please sign in to comment.