Skip to content

Commit d9845a6

Browse files
Merge branch 'danmar:main' into chr_12612
2 parents b477c79 + 4f8a48d commit d9845a6

334 files changed

Lines changed: 13879 additions & 8994 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: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,19 @@ Checks: >
1818
-objc-*,
1919
-openmp-*,
2020
-zircon-*,
21-
cert-err34-c,
2221
cppcoreguidelines-pro-type-static-cast-downcast,
2322
cppcoreguidelines-rvalue-reference-param-not-moved,
2423
google-explicit-constructor,
2524
-bugprone-assignment-in-if-condition,
2625
-bugprone-branch-clone,
26+
-bugprone-command-processor,
2727
-bugprone-easily-swappable-parameters,
2828
-bugprone-empty-catch,
2929
-bugprone-macro-parentheses,
3030
-bugprone-narrowing-conversions,
3131
-bugprone-signed-char-misuse,
3232
-bugprone-switch-missing-default-case,
33+
-bugprone-throwing-static-initialization,
3334
-bugprone-unchecked-optional-access,
3435
-clang-analyzer-*,
3536
-concurrency-mt-unsafe,
@@ -41,7 +42,9 @@ Checks: >
4142
-modernize-avoid-c-arrays,
4243
-modernize-deprecated-ios-base-aliases,
4344
-misc-include-cleaner,
45+
-misc-multiple-inheritance,
4446
-misc-unused-using-decls,
47+
-modernize-avoid-c-style-cast,
4548
-modernize-loop-convert,
4649
-modernize-macro-to-enum,
4750
-modernize-raw-string-literal,
@@ -67,11 +70,14 @@ Checks: >
6770
-readability-identifier-length,
6871
-readability-identifier-naming,
6972
-readability-implicit-bool-conversion,
73+
-readability-inconsistent-ifelse-braces,
7074
-readability-isolate-declaration,
7175
-readability-magic-numbers,
76+
-readability-redundant-parentheses,
7277
-readability-suspicious-call-argument,
7378
-readability-uppercase-literal-suffix,
74-
-readability-use-concise-preprocessor-directives
79+
-readability-use-concise-preprocessor-directives,
80+
-misc-unconventional-assign-operator
7581
WarningsAsErrors: '*'
7682
HeaderFilterRegex: '(cli|gui|frontend|lib|oss-fuzz|test|triage)\/[a-z_]+\.h'
7783
ExcludeHeaderFilterRegex: 'ui_.*.h'
@@ -82,3 +88,7 @@ CheckOptions:
8288
value: '0'
8389
- key: modernize-use-trailing-return-type.TransformFunctions
8490
value: false
91+
- key: misc-override-with-different-visibility.DisallowedVisibilityChange
92+
value: widening
93+
- key: misc-use-internal-linkage.AnalyzeTypes
94+
value: false

.github/workflows/CI-cygwin.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,9 @@ jobs:
4242
persist-credentials: false
4343

4444
- name: Set up Cygwin
45-
uses: cygwin/cygwin-install-action@master
45+
uses: cygwin/cygwin-install-action@v6
4646
with:
47+
site: https://mirrors.cicku.me/cygwin/
4748
platform: ${{ matrix.platform }}
4849
packages: ${{ matrix.packages }}
4950

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

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,16 @@ jobs:
2020

2121
strategy:
2222
matrix:
23-
image: ["ubuntu:24.04"]
2423
include:
25-
- build_gui: false
2624
- image: "ubuntu:24.04"
27-
build_gui: true
25+
with_gui: true
26+
full_build: true
27+
- image: "ubuntu:25.10"
28+
with_gui: true
29+
full_build: true
30+
- image: "alpine:3.23"
31+
with_gui: false # it appears FindQt6.cmake is not provided by any package
32+
full_build: false # FIXME: test-signalhandler.cpp fails to build since feenableexcept() is missing
2833
fail-fast: false # Prefer quick result
2934

3035
runs-on: ubuntu-22.04
@@ -49,29 +54,29 @@ jobs:
4954
apt-get install -y cmake g++ make libxml2-utils libpcre3-dev
5055
5156
- name: Install missing software (gui) on latest ubuntu
52-
if: matrix.build_gui
57+
if: contains(matrix.image, 'ubuntu')
5358
run: |
5459
apt-get install -y qt6-base-dev qt6-charts-dev qt6-tools-dev
5560
61+
- name: Install missing software on Alpine
62+
if: contains(matrix.image, 'alpine')
63+
run: |
64+
apk add cmake make g++ pcre-dev
65+
5666
# needs to be called after the package installation since
5767
# - it doesn't call "apt-get update"
5868
- name: ccache
5969
uses: hendrikmuhs/ccache-action@v1.2
6070
with:
6171
key: ${{ github.workflow }}-${{ matrix.image }}
6272

63-
- name: CMake build
64-
if: ${{ !matrix.build_gui }}
73+
- name: Run CMake
6574
run: |
66-
mkdir cmake.output
67-
cd cmake.output
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 ..
69-
cmake --build . -- -j$(nproc)
75+
cmake -S . -B cmake.output -Werror=dev -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=${{ matrix.with_gui }} -DWITH_QCHART=On -DBUILD_TRIAGE=${{ matrix.with_gui }} -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
7076
71-
- name: CMake build (with GUI)
72-
if: matrix.build_gui
77+
- name: CMake build
78+
if: matrix.full_build
7379
run: |
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
7580
cmake --build cmake.output -- -j$(nproc)
7681
7782
- name: Run CMake test
@@ -82,7 +87,7 @@ jobs:
8287

8388
strategy:
8489
matrix:
85-
image: ["ubuntu:24.04"]
90+
image: ["ubuntu:24.04", "ubuntu:25.10", "alpine:3.23"]
8691
fail-fast: false # Prefer quick result
8792

8893
runs-on: ubuntu-22.04
@@ -101,21 +106,28 @@ jobs:
101106
apt-get update
102107
apt-get install -y g++ make python3 libxml2-utils libpcre3-dev
103108
109+
- name: Install missing software on Alpine
110+
if: contains(matrix.image, 'alpine')
111+
run: |
112+
apk add make g++ pcre-dev bash python3 libxml2-utils
113+
104114
# needs to be called after the package installation since
105115
# - it doesn't call "apt-get update"
106116
- name: ccache
107117
uses: hendrikmuhs/ccache-action@v1.2
108118
with:
109119
key: ${{ github.workflow }}-${{ matrix.image }}
110120

121+
# /usr/lib/ccache/bin - Alpine Linux
122+
111123
- name: Build cppcheck
112124
run: |
113-
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
125+
export PATH="/usr/lib/ccache/bin:/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
114126
make -j$(nproc) HAVE_RULES=yes CXXOPTS="-Werror"
115127
116128
- name: Build test
117129
run: |
118-
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
130+
export PATH="/usr/lib/ccache/bin:/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
119131
make -j$(nproc) HAVE_RULES=yes CXXOPTS="-Werror" testrunner
120132
121133
- name: Run test

0 commit comments

Comments
 (0)