Skip to content

Fix CI after Debian image changes #157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kkaefer wants to merge 1 commit into from
+6 −13
Open

Fix CI after Debian image changes #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ jobs:
- "ubuntu:20.04" # gcc 9.3.0, clang 10.0.0, cmake 3.16.3
- "ubuntu:22.04" # gcc 12.2.0, clang 15.0.7, cmake 3.24.2
- "ubuntu:24.04" # gcc 14.2.0, clang 18.1.3, cmake 3.28.3
- "debian:bullseye" # gcc 10.2.1, clang 11.0.1, cmake 3.18.4
- "debian:bookworm" # gcc 12.2.0, clang 15.0.6, cmake 3.25.1
- "debian:trixie"
- "debian:testing"
Expand All @@ -43,13 +42,6 @@ jobs:
c_compiler: clang
cpp_compiler: clang++
cpp_version: 20
# Disabled because it fails due to a bug in the protobuf library
# See https://github.com/protocolbuffers/protobuf/issues/7224
# - image: "debian:bullseye"
# c_compiler: clang
# cpp_compiler: clang++
# CXXFLAGS: "-fsanitize=address,undefined,integer -fno-sanitize-recover=all -fno-omit-frame-pointer"
# LDFLAGS: "-fsanitize=address,undefined,integer"
- image: "debian:bookworm"
build_type: Release
- image: "debian:bookworm"
Expand Down Expand Up @@ -127,7 +119,7 @@ jobs:
-v "${{ github.workspace }}:/src" \
-w /src \
-e DEBIAN_FRONTEND=noninteractive \
debian:bookworm \
debian:trixie \
bash -exc '
apt-get update -qq
apt-get install -y \
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/clang-tidy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ jobs:
- image: "debian:trixie"
clang: 19
- image: "debian:testing"
clang: 19
clang: 22
- image: "debian:experimental"
clang: 20
clang: 24
container:
image: ${{ matrix.image }}
env:
BUILD_TYPE: Debug
CC: clang-${{ matrix.clang }}
CXX: clang++-${{ matrix.clang }}
CXXFLAGS: -Wno-c++20-extensions
CXXFLAGS: -Wno-c++20-extensions -Wno-c2y-extensions
CPP_VERSION: 14
APT_LISTCHANGES_FRONTEND: none
DEBIAN_FRONTEND: noninteractive
Expand All @@ -37,6 +37,7 @@ jobs:
clang-${{ matrix.clang }} \
clang-tidy-${{ matrix.clang }} \
cmake \
g++ \
libprotobuf-dev \
make \
protobuf-compiler
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ endif()
#
#-----------------------------------------------------------------------------
message(STATUS "Looking for clang-tidy")
find_program(CLANG_TIDY NAMES clang-tidy clang-tidy-20 clang-tidy-19 clang-tidy-18 clang-tidy-17 clang-tidy-16 clang-tidy-15)
find_program(CLANG_TIDY NAMES clang-tidy clang-tidy-24 clang-tidy-23 clang-tidy-22 clang-tidy-21 clang-tidy-20 clang-tidy-19 clang-tidy-18 clang-tidy-17 clang-tidy-16 clang-tidy-15)

if(CLANG_TIDY AND PROTOBUF_FOUND)
message(STATUS "Looking for clang-tidy - found ${CLANG_TIDY}")
Expand Down
Loading