Skip to content

Commit 82cdea1

Browse files
chrchr-githubchrchr-github
authored
Merge branch 'danmar:main' into chr_14578
2 parents e6cbc1f + 6a14618 commit 82cdea1

215 files changed

Lines changed: 6066 additions & 4962 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: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,12 @@ Checks: >
2323
google-explicit-constructor,
2424
-bugprone-assignment-in-if-condition,
2525
-bugprone-branch-clone,
26-
-bugprone-command-processor,
2726
-bugprone-easily-swappable-parameters,
2827
-bugprone-empty-catch,
2928
-bugprone-macro-parentheses,
3029
-bugprone-narrowing-conversions,
3130
-bugprone-signed-char-misuse,
3231
-bugprone-switch-missing-default-case,
33-
-bugprone-throwing-static-initialization,
3432
-bugprone-unchecked-optional-access,
3533
-clang-analyzer-*,
3634
-concurrency-mt-unsafe,
@@ -39,6 +37,7 @@ Checks: >
3937
-misc-non-private-member-variables-in-classes,
4038
-misc-throw-by-value-catch-by-reference,
4139
-misc-use-anonymous-namespace,
40+
-misc-use-internal-linkage,
4241
-modernize-avoid-c-arrays,
4342
-modernize-deprecated-ios-base-aliases,
4443
-misc-include-cleaner,
@@ -70,7 +69,7 @@ Checks: >
7069
-readability-implicit-bool-conversion,
7170
-readability-isolate-declaration,
7271
-readability-magic-numbers,
73-
-readability-redundant-parentheses,
72+
-readability-math-missing-parentheses,
7473
-readability-suspicious-call-argument,
7574
-readability-uppercase-literal-suffix,
7675
-readability-use-concise-preprocessor-directives,
@@ -85,5 +84,3 @@ CheckOptions:
8584
value: '0'
8685
- key: modernize-use-trailing-return-type.TransformFunctions
8786
value: false
88-
- key: misc-override-with-different-visibility.DisallowedVisibilityChange
89-
value: widening

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757

5858
- name: Run CMake
5959
run: |
60-
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
60+
cmake -S . -B cmake.output -Werror=dev -DHAVE_RULES=On -DBUILD_TESTING=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
6161
6262
- name: CMake build (with GUI)
6363
run: |

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

Lines changed: 55 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ jobs:
5858
- name: CMake build on ubuntu (with GUI / system tinyxml2)
5959
if: contains(matrix.os, 'ubuntu')
6060
run: |
61-
cmake -S . -B cmake.output.tinyxml2 -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_BUNDLED_TINYXML2=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
61+
cmake -S . -B cmake.output.tinyxml2 -Werror=dev -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_BUNDLED_TINYXML2=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
6262
cmake --build cmake.output.tinyxml2 -- -j$(nproc)
6363
6464
- name: CMake build on macos (with GUI / system tinyxml2)
6565
if: contains(matrix.os, 'macos')
6666
run: |
67-
cmake -S . -B cmake.output.tinyxml2 -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_BUNDLED_TINYXML2=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6
67+
cmake -S . -B cmake.output.tinyxml2 -Werror=dev -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_BUNDLED_TINYXML2=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6
6868
cmake --build cmake.output.tinyxml2 -- -j$(nproc)
6969
7070
- name: Run CMake test (system tinyxml2)
@@ -127,12 +127,12 @@ jobs:
127127
- name: Run CMake on ubuntu (with GUI)
128128
if: contains(matrix.os, 'ubuntu')
129129
run: |
130-
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install
130+
cmake -S . -B cmake.output -Werror=dev -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install
131131
132132
- name: Run CMake on macos (with GUI)
133133
if: contains(matrix.os, 'macos')
134134
run: |
135-
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6
135+
cmake -S . -B cmake.output -Werror=dev -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6
136136
137137
- name: Run CMake build
138138
run: |
@@ -154,13 +154,13 @@ jobs:
154154
- name: Run CMake on ubuntu (no CLI)
155155
if: matrix.os == 'ubuntu-22.04'
156156
run: |
157-
cmake -S . -B cmake.output_nocli -G "Unix Makefiles" -DBUILD_CLI=Off
157+
cmake -S . -B cmake.output_nocli -Werror=dev -DBUILD_TESTING=Off -DBUILD_CLI=Off
158158
159159
- name: Run CMake on ubuntu (no CLI / with tests)
160160
if: matrix.os == 'ubuntu-22.04'
161161
run: |
162162
# the test and CLI code are too intertwined so for now we need to reject that
163-
if cmake -S . -B cmake.output_nocli_tests -G "Unix Makefiles" -DBUILD_TESTS=On -DBUILD_CLI=Off; then
163+
if cmake -S . -B cmake.output_nocli_tests -Werror=dev -DBUILD_TESTING=On -DBUILD_CLI=Off; then
164164
exit 1
165165
else
166166
exit 0
@@ -169,18 +169,18 @@ jobs:
169169
- name: Run CMake on ubuntu (no CLI / with GUI)
170170
if: matrix.os == 'ubuntu-22.04'
171171
run: |
172-
cmake -S . -B cmake.output_nocli_gui -G "Unix Makefiles" -DBUILD_CLI=Off -DBUILD_GUI=On
172+
cmake -S . -B cmake.output_nocli_gui -Werror=dev -DBUILD_TESTING=Off -DBUILD_CLI=Off -DBUILD_GUI=On
173173
174174
- name: Run CMake on ubuntu (no GUI)
175175
if: matrix.os == 'ubuntu-22.04'
176176
run: |
177-
cmake -S . -B cmake.output_nogui -G "Unix Makefiles" -DBUILD_GUI=Off
177+
cmake -S . -B cmake.output_nogui -Werror=dev -DBUILD_TESTING=Off -DBUILD_GUI=Off
178178
179179
- name: Run CMake on ubuntu (no GUI / with triage)
180180
if: matrix.os == 'ubuntu-22.04'
181181
run: |
182182
# cannot build triage without GUI
183-
if cmake -S . -B cmake.output_nogui_triage -G "Unix Makefiles" -DBUILD_GUI=Off -DBUILD_TRIAGE=On; then
183+
if cmake -S . -B cmake.output_nogui_triage -Werror=dev -DBUILD_TESTING=Off -DBUILD_GUI=Off -DBUILD_TRIAGE=On; then
184184
exit 1
185185
else
186186
exit 0
@@ -189,7 +189,7 @@ jobs:
189189
- name: Run CMake on ubuntu (no CLI / no GUI)
190190
if: matrix.os == 'ubuntu-22.04'
191191
run: |
192-
cmake -S . -B cmake.output_nocli_nogui -G "Unix Makefiles" -DBUILD_GUI=Off
192+
cmake -S . -B cmake.output_nocli_nogui -Werror=dev -DBUILD_TESTING=Off -DBUILD_GUI=Off
193193
194194
build_cmake_cxxstd:
195195

@@ -243,12 +243,12 @@ jobs:
243243
- name: Run CMake on ubuntu (with GUI)
244244
if: contains(matrix.os, 'ubuntu')
245245
run: |
246-
cmake -S . -B cmake.output -G "Unix Makefiles" -DCMAKE_CXX_STANDARD=${{ matrix.cxxstd }} -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
246+
cmake -S . -B cmake.output -Werror=dev -DCMAKE_CXX_STANDARD=${{ matrix.cxxstd }} -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
247247
248248
- name: Run CMake on macos (with GUI)
249249
if: contains(matrix.os, 'macos')
250250
run: |
251-
cmake -S . -B cmake.output -G "Unix Makefiles" -DCMAKE_CXX_STANDARD=${{ matrix.cxxstd }} -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6
251+
cmake -S . -B cmake.output -Werror=dev -DCMAKE_CXX_STANDARD=${{ matrix.cxxstd }} -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6
252252
253253
- name: Run CMake build
254254
run: |
@@ -373,7 +373,7 @@ jobs:
373373
run: |
374374
# make sure we fail when Boost is requested and not available.
375375
# will fail because no package configuration is available.
376-
if cmake -S . -B cmake.output.boost-force-noavail -G "Unix Makefiles" -DUSE_BOOST=On; then
376+
if cmake -S . -B cmake.output.boost-force-noavail -Werror=dev -DBUILD_TESTING=Off -DUSE_BOOST=On; then
377377
exit 1
378378
else
379379
exit 0
@@ -386,12 +386,12 @@ jobs:
386386
387387
- name: Run CMake on macOS (force Boost)
388388
run: |
389-
cmake -S . -B cmake.output.boost-force -G "Unix Makefiles" -DUSE_BOOST=On
389+
cmake -S . -B cmake.output.boost-force -Werror=dev -DBUILD_TESTING=Off -DUSE_BOOST=On
390390
391391
- name: Run CMake on macOS (no Boost)
392392
run: |
393393
# make sure Boost is not used when disabled even though it is available
394-
cmake -S . -B cmake.output.boost-no -G "Unix Makefiles" -DUSE_BOOST=Off
394+
cmake -S . -B cmake.output.boost-no -Werror=dev -DBUILD_TESTING=Off -DUSE_BOOST=Off
395395
if grep -q '\-DHAVE_BOOST' ./cmake.output.boost-no/compile_commands.json; then
396396
exit 1
397397
else
@@ -400,13 +400,49 @@ jobs:
400400
401401
- name: Run CMake on macOS (with Boost)
402402
run: |
403-
cmake -S . -B cmake.output.boost -G "Unix Makefiles" -DBUILD_TESTS=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
403+
cmake -S . -B cmake.output.boost -Werror=dev -DBUILD_TESTING=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
404404
grep -q '\-DHAVE_BOOST' ./cmake.output.boost/compile_commands.json
405405
406406
- name: Build with CMake on macOS (with Boost)
407407
run: |
408408
cmake --build cmake.output.boost -- -j$(nproc)
409409
410+
build_cmake_minimum: # TODO: move to docker workflow?
411+
412+
runs-on: ubuntu-22.04 # use the oldest available runner
413+
414+
env:
415+
CMAKE_VERSION: 3.22
416+
CMAKE_VERSION_FULL: 3.22.6
417+
418+
steps:
419+
- uses: actions/checkout@v4
420+
with:
421+
persist-credentials: false
422+
423+
- name: Install missing software
424+
run: |
425+
sudo apt-get update
426+
sudo apt-get install libxml2-utils
427+
# qt6-tools-dev-tools for lprodump
428+
# qt6-l10n-tools for lupdate
429+
sudo apt-get install qt6-base-dev libqt6charts6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libglx-dev libgl1-mesa-dev
430+
431+
- name: Install CMake
432+
run: |
433+
wget https://cmake.org/files/v${{ env.CMAKE_VERSION }}/cmake-${{ env.CMAKE_VERSION_FULL }}-linux-x86_64.tar.gz
434+
tar xf cmake-${{ env.CMAKE_VERSION_FULL }}-linux-x86_64.tar.gz
435+
436+
- name: Run CMake (without GUI)
437+
run: |
438+
export PATH=cmake-${{ env.CMAKE_VERSION_FULL }}-linux-x86_64/bin:$PATH
439+
cmake -S . -B cmake.output -Werror=dev -DHAVE_RULES=On -DBUILD_TESTING=On
440+
441+
- name: Run CMake (with GUI)
442+
run: |
443+
export PATH=cmake-${{ env.CMAKE_VERSION_FULL }}-linux-x86_64/bin:$PATH
444+
cmake -S . -B cmake.output.gui -Werror=dev -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On
445+
410446
build:
411447

412448
strategy:
@@ -560,7 +596,7 @@ jobs:
560596
561597
- name: Test Signalhandler
562598
run: |
563-
cmake -S . -B build.cmake.signal -G "Unix Makefiles" -DBUILD_TESTS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On
599+
cmake -S . -B build.cmake.signal -Werror=dev -DBUILD_TESTING=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On
564600
cmake --build build.cmake.signal --target test-signalhandler -- -j$(nproc)
565601
# TODO: how to run this without copying the file?
566602
cp build.cmake.signal/bin/test-s* .
@@ -571,7 +607,7 @@ jobs:
571607
- name: Test Stacktrace
572608
if: contains(matrix.os, 'ubuntu')
573609
run: |
574-
cmake -S . -B build.cmake.stack -G "Unix Makefiles" -DBUILD_TESTS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On
610+
cmake -S . -B build.cmake.stack -Werror=dev -DBUILD_TESTING=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On
575611
cmake --build build.cmake.stack --target test-stacktrace -- -j$(nproc)
576612
# TODO: how to run this without copying the file?
577613
cp build.cmake.stack/bin/test-s* .
@@ -685,7 +721,7 @@ jobs:
685721
686722
- name: CMake
687723
run: |
688-
cmake -S . -B cmake.output -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_MATCHCOMPILER=Verify -DENABLE_CHECK_INTERNAL=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On
724+
cmake -S . -B cmake.output -Werror=dev -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_MATCHCOMPILER=Verify -DENABLE_CHECK_INTERNAL=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On
689725
690726
- name: Generate dependencies
691727
run: |

‎.github/workflows/CI-windows.yml‎

Lines changed: 45 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
run: |
5454
rem TODO: enable rules?
5555
rem specify Release build so matchcompiler is used
56-
cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DBUILD_ONLINE_HELP=On -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
56+
cmake -S . -B build -Werror=dev -DCMAKE_BUILD_TYPE=Release -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DBUILD_TESTING=Off -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DBUILD_ONLINE_HELP=On -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
5757
5858
- name: Build GUI release
5959
run: |
@@ -92,12 +92,54 @@ jobs:
9292

9393
- name: Run CMake
9494
run: |
95-
cmake -S . -B build.cxxstd -G "Visual Studio 17 2022" -A x64 -DCMAKE_CXX_STANDARD=${{ matrix.cxxstd }} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
95+
cmake -S . -B build.cxxstd -Werror=dev -G "Visual Studio 17 2022" -A x64 -DCMAKE_CXX_STANDARD=${{ matrix.cxxstd }} -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
9696
9797
- name: Build
9898
run: |
9999
cmake --build build.cxxstd --config Debug || exit /b !errorlevel!
100100
101+
build_cmake_minimum:
102+
103+
runs-on: windows-2022 # use the oldest available runner
104+
105+
env:
106+
CMAKE_VERSION: 3.22
107+
CMAKE_VERSION_FULL: 3.22.6
108+
109+
steps:
110+
- uses: actions/checkout@v4
111+
with:
112+
persist-credentials: false
113+
114+
- name: Install CMake
115+
run: |
116+
curl -fsSL https://cmake.org/files/v${{ env.CMAKE_VERSION }}/cmake-${{ env.CMAKE_VERSION_FULL }}-windows-x86_64.zip -o cmake.zip || exit /b !errorlevel!
117+
7z x cmake.zip || exit /b !errorlevel!
118+
119+
- name: Set up Visual Studio environment
120+
uses: ilammy/msvc-dev-cmd@v1
121+
with:
122+
arch: x64
123+
124+
- name: Install Qt
125+
uses: jurplel/install-qt-action@v4
126+
with:
127+
version: 6.10.0
128+
modules: 'qtcharts'
129+
setup-python: 'false'
130+
cache: true
131+
aqtversion: '==3.1.*' # TODO: remove when aqtinstall 3.2.2 is available
132+
133+
- name: Run CMake (without GUI)
134+
run: |
135+
:: TODO: enable DHAVE_RULES?
136+
cmake-${{ env.CMAKE_VERSION_FULL }}-windows-x86_64\bin\cmake.exe -S . -B cmake.output -G "Visual Studio 17 2022" -A x64 -DHAVE_RULES=Off -DBUILD_TESTING=On
137+
138+
- name: Run CMake (with GUI)
139+
run: |
140+
:: TODO: enable DHAVE_RULES?
141+
cmake-${{ env.CMAKE_VERSION_FULL }}-windows-x86_64\bin\cmake.exe -S . -B cmake.output.gui -G "Visual Studio 17 2022" -A x64 -DHAVE_RULES=Off -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On
142+
101143
build:
102144
strategy:
103145
matrix:
@@ -230,7 +272,7 @@ jobs:
230272
- name: Test SEH wrapper
231273
if: matrix.config == 'release'
232274
run: |
233-
cmake -S . -B build.cmake.seh -DBUILD_TESTS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
275+
cmake -S . -B build.cmake.seh -Werror=dev -DBUILD_TESTING=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
234276
cmake --build build.cmake.seh --target test-sehwrapper || exit /b !errorlevel!
235277
:: TODO: how to run this without copying the file?
236278
copy build.cmake.seh\bin\Debug\test-sehwrapper.exe . || exit /b !errorlevel!

‎.github/workflows/asan.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
sudo apt-get purge --auto-remove llvm python3-lldb-14 llvm-14
5555
wget https://apt.llvm.org/llvm.sh
5656
chmod +x llvm.sh
57-
sudo ./llvm.sh 22
57+
sudo ./llvm.sh 21
5858
5959
- name: Install Qt ${{ env.QT_VERSION }}
6060
uses: jurplel/install-qt-action@v4
@@ -74,10 +74,10 @@ jobs:
7474
7575
- name: CMake
7676
run: |
77-
cmake -S . -B cmake.output -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_MATCHCOMPILER=Verify -DANALYZE_ADDRESS=On -DENABLE_CHECK_INTERNAL=On -DUSE_BOOST=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DFILESDIR= -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
77+
cmake -S . -B cmake.output -Werror=dev -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_MATCHCOMPILER=Verify -DANALYZE_ADDRESS=On -DENABLE_CHECK_INTERNAL=On -DUSE_BOOST=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DFILESDIR= -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
7878
env:
79-
CC: clang-22
80-
CXX: clang++-22
79+
CC: clang-21
80+
CXX: clang++-21
8181

8282
- name: Build cppcheck
8383
run: |

0 commit comments

Comments
 (0)