Skip to content

Commit 33822ca

Browse files
Merge branch 'main' into chr_14119
2 parents f833907 + c8a7ab8 commit 33822ca

162 files changed

Lines changed: 2944 additions & 1460 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.clang-tidy

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,12 @@ Checks: >
5050
-modernize-type-traits,
5151
-modernize-use-designated-initializers,
5252
-modernize-use-nodiscard,
53+
-modernize-use-scoped-lock,
5354
-modernize-use-trailing-return-type,
5455
-performance-avoid-endl,
5556
-performance-inefficient-string-concatenation,
5657
-performance-no-automatic-move,
58+
-portability-avoid-pragma-once,
5759
-portability-simd-intrinsics,
5860
-portability-std-allocator-const,
5961
-readability-avoid-nested-conditional-operator,
@@ -68,7 +70,8 @@ Checks: >
6870
-readability-isolate-declaration,
6971
-readability-magic-numbers,
7072
-readability-suspicious-call-argument,
71-
-readability-uppercase-literal-suffix
73+
-readability-uppercase-literal-suffix,
74+
-readability-use-concise-preprocessor-directives
7275
WarningsAsErrors: '*'
7376
HeaderFilterRegex: '(cli|gui|frontend|lib|oss-fuzz|test|triage)\/[a-z_]+\.h'
7477
ExcludeHeaderFilterRegex: 'ui_.*.h'
@@ -77,3 +80,5 @@ CheckOptions:
7780
value: '1'
7881
- key: readability-simplify-boolean-expr.SimplifyDeMorgan
7982
value: '0'
83+
- key: modernize-use-trailing-return-type.TransformFunctions
84+
value: false

.github/workflows/CI-cygwin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
# Cygwin will always link the binaries even if they already exist. The linking is also extremely slow. So just run the "check" target which includes all the binaries.
5151
- name: Build all and run test
5252
run: |
53-
C:\cygwin\bin\bash.exe -l -c cd %GITHUB_WORKSPACE% && make VERBOSE=1 -j%NUMBER_OF_PROCESSORS% check
53+
C:\cygwin\bin\bash.exe -l -c cd %GITHUB_WORKSPACE% && make VERBOSE=1 -j%NUMBER_OF_PROCESSORS% CXXOPTS="-Werror" check
5454
5555
- name: Extra test for misra
5656
run: |

.github/workflows/CI-mingw.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,27 +53,23 @@ jobs:
5353
with:
5454
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
5555

56-
# TODO: bail out on warning
5756
- name: Build cppcheck
5857
run: |
5958
export PATH="/mingw64/lib/ccache/bin:$PATH"
6059
# set RDYNAMIC to work around broken MinGW detection
61-
make VERBOSE=1 RDYNAMIC=-lshlwapi -j$(nproc) cppcheck
62-
env:
63-
LDFLAGS: -fuse-ld=lld # use lld for faster linking
60+
# use lld for faster linking
61+
make VERBOSE=1 RDYNAMIC=-lshlwapi LDOPTS=-fuse-ld=lld -j$(nproc) CXXOPTS="-Werror" cppcheck
6462
6563
- name: Build test
6664
run: |
6765
export PATH="/mingw64/lib/ccache/bin:$PATH"
6866
# set RDYNAMIC to work around broken MinGW detection
69-
make VERBOSE=1 RDYNAMIC=-lshlwapi -j$(nproc) testrunner
70-
env:
71-
LDFLAGS: -fuse-ld=lld # use lld for faster linking
67+
# use lld for faster linking
68+
make VERBOSE=1 RDYNAMIC=-lshlwapi LDOPTS=-fuse-ld=lld -j$(nproc) CXXOPTS="-Werror" testrunner
7269
7370
- name: Run test
7471
run: |
7572
export PATH="/mingw64/lib/ccache/bin:$PATH"
7673
# set RDYNAMIC to work around broken MinGW detection
77-
make VERBOSE=1 RDYNAMIC=-lshlwapi -j$(nproc) check
78-
env:
79-
LDFLAGS: -fuse-ld=lld # use lld for faster linking
74+
# use lld for faster linking
75+
make VERBOSE=1 RDYNAMIC=-lshlwapi LDOPTS=-fuse-ld=lld -j$(nproc) CXXOPTS="-Werror" check

.github/workflows/CI-unixish-docker.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,11 @@ jobs:
2020

2121
strategy:
2222
matrix:
23-
image: ["ubuntu:24.04", "ubuntu:24.10"]
23+
image: ["ubuntu:24.04"]
2424
include:
2525
- build_gui: false
2626
- image: "ubuntu:24.04"
2727
build_gui: true
28-
- image: "ubuntu:24.10"
29-
build_gui: true
3028
fail-fast: false # Prefer quick result
3129

3230
runs-on: ubuntu-22.04
@@ -67,13 +65,13 @@ jobs:
6765
run: |
6866
mkdir cmake.output
6967
cd cmake.output
70-
cmake -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ..
68+
cmake -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ..
7169
cmake --build . -- -j$(nproc)
7270
7371
- name: CMake build (with GUI)
7472
if: matrix.build_gui
7573
run: |
76-
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
74+
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
7775
cmake --build cmake.output -- -j$(nproc)
7876
7977
- name: Run CMake test
@@ -84,7 +82,7 @@ jobs:
8482

8583
strategy:
8684
matrix:
87-
image: ["ubuntu:24.04", "ubuntu:24.10"]
85+
image: ["ubuntu:24.04"]
8886
fail-fast: false # Prefer quick result
8987

9088
runs-on: ubuntu-22.04
@@ -113,16 +111,16 @@ jobs:
113111
- name: Build cppcheck
114112
run: |
115113
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
116-
make -j$(nproc) HAVE_RULES=yes CXXFLAGS="-w"
114+
make -j$(nproc) HAVE_RULES=yes CXXOPTS="-Werror"
117115
118116
- name: Build test
119117
run: |
120118
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
121-
make -j$(nproc) testrunner HAVE_RULES=yes CXXFLAGS="-w"
119+
make -j$(nproc) HAVE_RULES=yes CXXOPTS="-Werror" testrunner
122120
123121
- name: Run test
124122
run: |
125-
make -j$(nproc) check HAVE_RULES=yes
123+
make -j$(nproc) HAVE_RULES=yes check
126124
127125
# requires python3
128126
- name: Run extra tests

0 commit comments

Comments
 (0)