Skip to content

Commit d241c95

Browse files
Merge branch 'main' into chr_15219
2 parents 5db5d7f + 415be9c commit d241c95

81 files changed

Lines changed: 763 additions & 624 deletions

Some content is hidden

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

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ jobs:
5252
uses: hendrikmuhs/ccache-action@v1.2.24
5353
with:
5454
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
55+
# only save cache in main/release branches, PRs restore the cache of the base branch
56+
save: ${{ github.event_name != 'pull_request' }}
5557

5658
- name: Build cppcheck
5759
run: |

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,28 +51,30 @@ jobs:
5151
if: contains(matrix.image, 'ubuntu')
5252
run: |
5353
apt-get update
54-
apt-get install -y cmake g++ make libxml2-utils libpcre3-dev
54+
apt-get install -y cmake g++ make libxml2-utils libpcre2-dev
5555
5656
- name: Install missing software (gui) on latest ubuntu
5757
if: contains(matrix.image, 'ubuntu')
5858
run: |
59-
apt-get install -y qt6-base-dev qt6-charts-dev qt6-tools-dev
59+
apt-get install -y qt6-base-dev qt6-tools-dev
6060
6161
- name: Install missing software on Alpine
6262
if: contains(matrix.image, 'alpine')
6363
run: |
64-
apk add cmake make g++ pcre-dev
64+
apk add cmake make g++ pcre2-dev
6565
6666
# needs to be called after the package installation since
6767
# - it doesn't call "apt-get update"
6868
- name: ccache
6969
uses: hendrikmuhs/ccache-action@v1.2.24
7070
with:
7171
key: ${{ github.workflow }}-${{ matrix.image }}
72+
# only save cache in main/release branches, PRs restore the cache of the base branch
73+
save: ${{ github.event_name != 'pull_request' }}
7274

7375
- name: Run CMake
7476
run: |
75-
cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -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
77+
cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=${{ matrix.with_gui }} -DBUILD_TRIAGE=${{ matrix.with_gui }} -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
7678
7779
- name: CMake build
7880
if: matrix.full_build
@@ -104,19 +106,21 @@ jobs:
104106
if: contains(matrix.image, 'ubuntu')
105107
run: |
106108
apt-get update
107-
apt-get install -y g++ make python3 libxml2-utils libpcre3-dev
109+
apt-get install -y g++ make python3 libxml2-utils libpcre2-dev
108110
109111
- name: Install missing software on Alpine
110112
if: contains(matrix.image, 'alpine')
111113
run: |
112-
apk add make g++ pcre-dev bash python3 libxml2-utils
114+
apk add make g++ pcre2-dev bash python3 libxml2-utils
113115
114116
# needs to be called after the package installation since
115117
# - it doesn't call "apt-get update"
116118
- name: ccache
117119
uses: hendrikmuhs/ccache-action@v1.2.24
118120
with:
119121
key: ${{ github.workflow }}-${{ matrix.image }}
122+
# only save cache in main/release branches, PRs restore the cache of the base branch
123+
save: ${{ github.event_name != 'pull_request' }}
120124

121125
# /usr/lib/ccache/bin - Alpine Linux
122126

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

Lines changed: 33 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ jobs:
3838
uses: hendrikmuhs/ccache-action@v1.2.24
3939
with:
4040
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
41+
# only save cache in main/release branches, PRs restore the cache of the base branch
42+
save: ${{ github.event_name != 'pull_request' }}
4143

4244
- name: Install missing software on ubuntu
4345
if: contains(matrix.os, 'ubuntu')
@@ -46,25 +48,24 @@ jobs:
4648
sudo apt-get install libxml2-utils libtinyxml2-dev
4749
# qt6-tools-dev-tools for lprodump
4850
# qt6-l10n-tools for lupdate
49-
sudo apt-get install qt6-base-dev libqt6charts6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libglx-dev libgl1-mesa-dev
51+
sudo apt-get install qt6-base-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libglx-dev libgl1-mesa-dev
5052
5153
# coreutils contains "nproc"
5254
- name: Install missing software on macos
5355
if: contains(matrix.os, 'macos')
5456
run: |
55-
# pcre was removed from runner images in November 2022
56-
brew install coreutils qt@6 tinyxml2 pcre
57+
brew install coreutils qt@6 tinyxml2 pcre2
5758
5859
- name: CMake build on ubuntu (with GUI / system tinyxml2)
5960
if: contains(matrix.os, 'ubuntu')
6061
run: |
61-
cmake -S . -B cmake.output.tinyxml2 -Werror=dev --warn-uninitialized -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
62+
cmake -S . -B cmake.output.tinyxml2 -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=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
6263
cmake --build cmake.output.tinyxml2 -- -j$(nproc)
6364
6465
- name: CMake build on macos (with GUI / system tinyxml2)
6566
if: contains(matrix.os, 'macos')
6667
run: |
67-
cmake -S . -B cmake.output.tinyxml2 -Werror=dev --warn-uninitialized -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
68+
cmake -S . -B cmake.output.tinyxml2 -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=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
6869
cmake --build cmake.output.tinyxml2 -- -j$(nproc)
6970
7071
- name: Run CMake test (system tinyxml2)
@@ -93,6 +94,8 @@ jobs:
9394
uses: hendrikmuhs/ccache-action@v1.2.24
9495
with:
9596
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
97+
# only save cache in main/release branches, PRs restore the cache of the base branch
98+
save: ${{ github.event_name != 'pull_request' }}
9699

97100
# TODO: move latest compiler to separate step
98101
# TODO: bail out on warnings with latest GCC
@@ -115,24 +118,23 @@ jobs:
115118
sudo apt-get install libxml2-utils
116119
# qt6-tools-dev-tools for lprodump
117120
# qt6-l10n-tools for lupdate
118-
sudo apt-get install qt6-base-dev libqt6charts6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libglx-dev libgl1-mesa-dev
121+
sudo apt-get install qt6-base-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libglx-dev libgl1-mesa-dev
119122
120123
# coreutils contains "nproc"
121124
- name: Install missing software on macos
122125
if: contains(matrix.os, 'macos')
123126
run: |
124-
# pcre was removed from runner images in November 2022
125-
brew install coreutils qt@6 pcre
127+
brew install coreutils qt@6 pcre2
126128
127129
- name: Run CMake on ubuntu (with GUI)
128130
if: contains(matrix.os, 'ubuntu')
129131
run: |
130-
cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -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
132+
cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=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
131133
132134
- name: Run CMake on macos (with GUI)
133135
if: contains(matrix.os, 'macos')
134136
run: |
135-
cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -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
137+
cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=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
136138
137139
- name: Run CMake build
138140
run: |
@@ -224,6 +226,8 @@ jobs:
224226
uses: hendrikmuhs/ccache-action@v1.2.24
225227
with:
226228
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}-${{ matrix.cxxstd }}
229+
# only save cache in main/release branches, PRs restore the cache of the base branch
230+
save: ${{ github.event_name != 'pull_request' }}
227231

228232
- name: Install missing software on ubuntu
229233
if: contains(matrix.os, 'ubuntu')
@@ -232,24 +236,23 @@ jobs:
232236
sudo apt-get install libxml2-utils
233237
# qt6-tools-dev-tools for lprodump
234238
# qt6-l10n-tools for lupdate
235-
sudo apt-get install qt6-base-dev libqt6charts6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libglx-dev libgl1-mesa-dev
239+
sudo apt-get install qt6-base-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libglx-dev libgl1-mesa-dev
236240
237241
# coreutils contains "nproc"
238242
- name: Install missing software on macos
239243
if: contains(matrix.os, 'macos')
240244
run: |
241-
# pcre was removed from runner images in November 2022
242-
brew install coreutils qt@6 pcre
245+
brew install coreutils qt@6 pcre2
243246
244247
- name: Run CMake on ubuntu (with GUI)
245248
if: contains(matrix.os, 'ubuntu')
246249
run: |
247-
cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -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
250+
cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DCMAKE_CXX_STANDARD=${{ matrix.cxxstd }} -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=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
248251
249252
- name: Run CMake on macos (with GUI)
250253
if: contains(matrix.os, 'macos')
251254
run: |
252-
cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -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
255+
cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DCMAKE_CXX_STANDARD=${{ matrix.cxxstd }} -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=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
253256
254257
- name: Run CMake build
255258
run: |
@@ -273,6 +276,8 @@ jobs:
273276
uses: hendrikmuhs/ccache-action@v1.2.24
274277
with:
275278
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
279+
# only save cache in main/release branches, PRs restore the cache of the base branch
280+
save: ${{ github.event_name != 'pull_request' }}
276281

277282
# coreutils contains "nproc"
278283
- name: Install missing software on macos
@@ -307,6 +312,8 @@ jobs:
307312
uses: hendrikmuhs/ccache-action@v1.2.24
308313
with:
309314
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
315+
# only save cache in main/release branches, PRs restore the cache of the base branch
316+
save: ${{ github.event_name != 'pull_request' }}
310317

311318
# coreutils contains "nproc"
312319
- name: Install missing software on macos
@@ -369,6 +376,8 @@ jobs:
369376
uses: hendrikmuhs/ccache-action@v1.2.24
370377
with:
371378
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
379+
# only save cache in main/release branches, PRs restore the cache of the base branch
380+
save: ${{ github.event_name != 'pull_request' }}
372381

373382
- name: Run CMake on macOS (force Boost)
374383
run: |
@@ -427,7 +436,7 @@ jobs:
427436
sudo apt-get install libxml2-utils
428437
# qt6-tools-dev-tools for lprodump
429438
# qt6-l10n-tools for lupdate
430-
sudo apt-get install qt6-base-dev libqt6charts6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libglx-dev libgl1-mesa-dev
439+
sudo apt-get install qt6-base-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libglx-dev libgl1-mesa-dev
431440
432441
- name: Install CMake
433442
run: |
@@ -444,7 +453,7 @@ jobs:
444453
run: |
445454
export PATH=cmake-${{ env.CMAKE_VERSION_FULL }}-linux-x86_64/bin:$PATH
446455
# FIXME: cannot use --warn-uninitialized here as it completely breaks the build
447-
cmake -S . -B cmake.output.gui -Werror=dev -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On
456+
cmake -S . -B cmake.output.gui -Werror=dev -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DBUILD_TRIAGE=On
448457
449458
build:
450459

@@ -469,6 +478,8 @@ jobs:
469478
uses: hendrikmuhs/ccache-action@v1.2.24
470479
with:
471480
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
481+
# only save cache in main/release branches, PRs restore the cache of the base branch
482+
save: ${{ github.event_name != 'pull_request' }}
472483

473484
- name: Install missing software on ubuntu
474485
if: contains(matrix.os, 'ubuntu')
@@ -486,8 +497,7 @@ jobs:
486497
- name: Install missing software on macos
487498
if: contains(matrix.os, 'macos')
488499
run: |
489-
# pcre was removed from runner images in November 2022
490-
brew install coreutils pcre gnu-sed
500+
brew install coreutils pcre2 gnu-sed
491501
492502
- name: Install missing Python packages on ubuntu
493503
if: contains(matrix.os, 'ubuntu')
@@ -720,13 +730,15 @@ jobs:
720730
uses: hendrikmuhs/ccache-action@v1.2.24
721731
with:
722732
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
733+
# only save cache in main/release branches, PRs restore the cache of the base branch
734+
save: ${{ github.event_name != 'pull_request' }}
723735

724736
- name: Install missing software on ubuntu
725737
run: |
726738
sudo apt-get update
727739
# qt6-tools-dev-tools for lprodump
728740
# qt6-l10n-tools for lupdate
729-
sudo apt-get install qt6-base-dev libqt6charts6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libglx-dev libgl1-mesa-dev
741+
sudo apt-get install qt6-base-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libglx-dev libgl1-mesa-dev
730742
sudo apt-get install libboost-container-dev
731743
732744
- name: Self check (build)
@@ -737,7 +749,7 @@ jobs:
737749
738750
- name: CMake
739751
run: |
740-
cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -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
752+
cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=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
741753
742754
- name: Generate dependencies
743755
run: |

0 commit comments

Comments
 (0)