Skip to content

Commit 6be6b48

Browse files
committed
CMake/Github action: Modernize
1 parent 009565d commit 6be6b48

5 files changed

Lines changed: 19 additions & 19 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,53 +23,36 @@ jobs:
2323
build_type: [Dev]
2424
cpp_compiler: [g++]
2525
include:
26-
- image: "ubuntu:22.04"
27-
CXXFLAGS: -Wno-stringop-overread -Wno-array-bounds
28-
- image: "ubuntu:24.04"
29-
CXXFLAGS: -Wno-stringop-overread -Wno-array-bounds
3026
- image: "debian:bookworm"
3127
c_compiler: clang
3228
cpp_compiler: clang++
33-
- image: "debian:bookworm"
34-
build_type: RelWithDebInfo
35-
- image: "debian:trixie"
36-
CXXFLAGS: -Wno-stringop-overread -Wno-array-bounds
3729
- image: "debian:trixie"
3830
c_compiler: clang
3931
cpp_compiler: clang++
4032
- image: "debian:trixie"
4133
build_type: RelWithDebInfo
42-
CXXFLAGS: -Wno-stringop-overread -Wno-array-bounds
43-
- image: "debian:testing"
44-
CXXFLAGS: -Wno-stringop-overread -Wno-array-bounds -Wno-maybe-uninitialized
4534
- image: "debian:testing"
4635
c_compiler: clang
4736
cpp_compiler: clang++
48-
- image: "debian:experimental"
49-
CXXFLAGS: -Wno-stringop-overread -Wno-array-bounds -Wno-maybe-uninitialized
5037
- image: "debian:experimental"
5138
c_compiler: clang
5239
cpp_compiler: clang++
5340
- image: "fedora:40"
5441
CMAKE_OPTS: -DRUN_TESTS_WITH_BINARY_COMPARE=OFF
55-
CXXFLAGS: -Wno-stringop-overread -Wno-array-bounds
5642
- image: "fedora:41"
5743
CMAKE_OPTS: -DRUN_TESTS_WITH_BINARY_COMPARE=OFF
58-
CXXFLAGS: -Wno-stringop-overread -Wno-array-bounds
5944
- image: "fedora:42"
6045
CMAKE_OPTS: -DRUN_TESTS_WITH_BINARY_COMPARE=OFF
61-
CXXFLAGS: -Wno-stringop-overread -Wno-array-bounds -Wno-maybe-uninitialized
6246
- image: "fedora:43"
6347
CMAKE_OPTS: -DRUN_TESTS_WITH_BINARY_COMPARE=OFF
64-
CXXFLAGS: -Wno-stringop-overread -Wno-array-bounds -Wno-maybe-uninitialized
6548
container:
6649
image: ${{ matrix.image }}
6750
env:
6851
LANG: en_US.UTF-8
6952
BUILD_TYPE: ${{ matrix.build_type }}
7053
CC: ${{ matrix.c_compiler }}
7154
CXX: ${{ matrix.cpp_compiler }}
72-
CXXFLAGS: ${{ matrix.CXXFLAGS }}
55+
CXXFLAGS: -Werror ${{ matrix.CXXFLAGS }}
7356
LDFLAGS: ${{ matrix.LDFLAGS }}
7457
APT_LISTCHANGES_FRONTEND: none
7558
DEBIAN_FRONTEND: noninteractive
@@ -84,7 +67,6 @@ jobs:
8467
cmake \
8568
g++ \
8669
git \
87-
libboost-dev \
8870
libboost-program-options-dev \
8971
libbz2-dev \
9072
libexpat1-dev \
@@ -121,6 +103,7 @@ jobs:
121103
env:
122104
CC: clang-18
123105
CXX: clang++-18
106+
CXXFLAGS: -Werror
124107
BUILD_TYPE: Dev
125108
steps:
126109
- uses: actions/checkout@v4
@@ -147,6 +130,7 @@ jobs:
147130
env:
148131
CC: clang
149132
CXX: clang++
133+
CXXFLAGS: -Werror
150134
BUILD_TYPE: ${{ matrix.build_type }}
151135
steps:
152136
- uses: actions/checkout@v4

dense_tiles/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS})
2121

2222
include(common)
2323

24+
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
25+
add_definitions(-Wno-stringop-overread)
26+
endif()
27+
2428
enable_testing()
2529

2630
#----------------------------------------------------------------------

export_to_wkt/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS})
2121

2222
include(common)
2323

24+
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
25+
add_definitions(-Wno-stringop-overread)
26+
endif()
27+
2428
enable_testing()
2529

2630
#----------------------------------------------------------------------

mapolution/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS})
2424

2525
include(common)
2626

27+
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
28+
add_definitions(-Wno-stringop-overread)
29+
endif()
30+
2731
enable_testing()
2832

2933
#----------------------------------------------------------------------

node_density/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS})
2424

2525
include(common)
2626

27+
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
28+
add_definitions(-Wno-stringop-overread)
29+
endif()
30+
2731
enable_testing()
2832

2933
#----------------------------------------------------------------------

0 commit comments

Comments
 (0)