Skip to content

Commit eb6bca2

Browse files
Merge branch 'main' into chr_14810
2 parents c6c002a + 26bff2d commit eb6bca2

215 files changed

Lines changed: 10416 additions & 9638 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.

.github/workflows/CI-windows.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ jobs:
4747
modules: 'qtcharts'
4848
setup-python: 'false'
4949
cache: true
50-
aqtversion: '==3.1.*' # TODO: remove when aqtinstall 3.2.2 is available
5150

5251
- name: Run CMake
5352
run: |
@@ -92,7 +91,7 @@ jobs:
9291

9392
- name: Run CMake
9493
run: |
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!
94+
cmake -S . -B build.cxxstd -Werror=dev -A x64 -DCMAKE_CXX_STANDARD=${{ matrix.cxxstd }} -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
9695
9796
- name: Build
9897
run: |
@@ -128,17 +127,16 @@ jobs:
128127
modules: 'qtcharts'
129128
setup-python: 'false'
130129
cache: true
131-
aqtversion: '==3.1.*' # TODO: remove when aqtinstall 3.2.2 is available
132130

133131
- name: Run CMake (without GUI)
134132
run: |
135133
:: 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
134+
cmake-${{ env.CMAKE_VERSION_FULL }}-windows-x86_64\bin\cmake.exe -S . -B cmake.output -A x64 -DHAVE_RULES=Off -DBUILD_TESTING=On
137135
138136
- name: Run CMake (with GUI)
139137
run: |
140138
:: 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
139+
cmake-${{ env.CMAKE_VERSION_FULL }}-windows-x86_64\bin\cmake.exe -S . -B cmake.output.gui -A x64 -DHAVE_RULES=Off -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On
142140
143141
build:
144142
strategy:

.github/workflows/corpus.yml

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
# Syntax reference https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions
2+
# Environment reference https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners
3+
name: corpus
4+
5+
on:
6+
schedule:
7+
- cron: '0 0 * * 0'
8+
workflow_dispatch:
9+
10+
permissions:
11+
contents: read
12+
13+
jobs:
14+
corpus:
15+
runs-on: ubuntu-22.04
16+
if: ${{ github.repository_owner == 'cppcheck-opensource' }}
17+
18+
steps:
19+
- uses: actions/checkout@v4
20+
with:
21+
persist-credentials: false
22+
23+
- name: ccache
24+
uses: hendrikmuhs/ccache-action@v1.2
25+
with:
26+
key: ${{ github.workflow }}-${{ runner.os }}
27+
28+
- name: Install missing software on ubuntu
29+
run: |
30+
sudo apt-get update
31+
sudo apt-get install -y fdupes
32+
33+
- name: build testrunner
34+
run: |
35+
store_dir=$(pwd)/store
36+
mkdir $store_dir
37+
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
38+
make -j$(nproc) CXXOPTS="-Werror" CPPOPTS="-DSTORE_INPUT_DIR=\"\\\"$store_dir\\\"\"" testrunner
39+
40+
- name: run testrunner
41+
run: |
42+
./testrunner -q
43+
44+
- name: de-duplicate files
45+
run: |
46+
set -x
47+
ls -l ./store | wc -l
48+
echo "removing duplicates"
49+
fdupes -qdN ./store > /dev/null
50+
ls -l ./store | wc -l
51+
# print largest size
52+
ls -l ./store | cut -d' ' -f5 | sort -u -n -r | head -n1
53+
54+
- uses: actions/upload-artifact@v4
55+
if: success()
56+
with:
57+
name: corpus
58+
path: ./store

.github/workflows/iwyu.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
- name: Install missing software on Fedora
7272
if: contains(matrix.image, 'fedora')
7373
run: |
74-
dnf install -y cmake clang pcre-devel
74+
dnf install -y cmake clang
7575
dnf install -y libglvnd-devel # fixes missing dependency for Qt in CMake
7676
dnf install -y p7zip-plugins # required as fallback for py7zr in Qt installation
7777
dnf install -y python3-pip # fixes missing pip module in jurplel/install-qt-action
@@ -125,7 +125,8 @@ jobs:
125125
126126
- name: Prepare CMake
127127
run: |
128-
cmake -S . -B cmake.output -Werror=dev -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCPPCHK_GLIBCXX_DEBUG=Off -DUSE_MATCHCOMPILER=Off -DEXTERNALS_AS_SYSTEM=On -DUSE_LIBCXX=${{ matrix.stdlib == 'libc++' }}
128+
# TODO: re-enable HAVE_RULES
129+
cmake -S . -B cmake.output -Werror=dev -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=Off -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCPPCHK_GLIBCXX_DEBUG=Off -DUSE_MATCHCOMPILER=Off -DEXTERNALS_AS_SYSTEM=On -DUSE_LIBCXX=${{ matrix.stdlib == 'libc++' }}
129130
env:
130131
CC: clang
131132
CXX: clang++
@@ -232,7 +233,8 @@ jobs:
232233

233234
- name: Prepare CMake
234235
run: |
235-
cmake -S . -B cmake.output -Werror=dev -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCPPCHK_GLIBCXX_DEBUG=Off -DUSE_MATCHCOMPILER=Off -DEXTERNALS_AS_SYSTEM=On -DUSE_LIBCXX=${{ matrix.use_libcxx }}
236+
# TODO: re-enable HAVE_RULES
237+
cmake -S . -B cmake.output -Werror=dev -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=Off -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCPPCHK_GLIBCXX_DEBUG=Off -DUSE_MATCHCOMPILER=Off -DEXTERNALS_AS_SYSTEM=On -DUSE_LIBCXX=${{ matrix.use_libcxx }}
236238
env:
237239
CC: clang-22
238240
CXX: clang++-22

.github/workflows/release-windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ jobs:
5555
7z x pcre-%PCRE_VERSION%.zip || exit /b !errorlevel!
5656
cd pcre-%PCRE_VERSION% || exit /b !errorlevel!
5757
git apply --ignore-space-change ..\externals\pcre.patch || exit /b !errorlevel!
58-
cmake . -G "Visual Studio 17 2022" -A x64 -DPCRE_BUILD_PCRECPP=OFF -DPCRE_BUILD_PCREGREP=OFF -DPCRE_BUILD_TESTS=OFF -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
59-
msbuild -m PCRE.sln -p:Configuration=Release -p:Platform=x64 || exit /b !errorlevel!
58+
cmake . -A x64 -DPCRE_BUILD_PCRECPP=OFF -DPCRE_BUILD_PCREGREP=OFF -DPCRE_BUILD_TESTS=OFF -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
59+
msbuild -m PCRE.slnx -p:Configuration=Release -p:Platform=x64 || exit /b !errorlevel!
6060
copy pcre.h ..\externals || exit /b !errorlevel!
6161
copy Release\pcre.lib ..\externals\pcre64.lib || exit /b !errorlevel!
6262

.github/workflows/selfcheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ jobs:
121121
122122
- name: Self check (unusedFunction / no test / no gui)
123123
run: |
124-
supprs="--suppress=unusedFunction:lib/errorlogger.h:197 --suppress=unusedFunction:lib/importproject.cpp:1665 --suppress=unusedFunction:lib/importproject.cpp:1689"
124+
supprs="--suppress=unusedFunction:lib/errorlogger.h:197 --suppress=unusedFunction:lib/importproject.cpp:1666 --suppress=unusedFunction:lib/importproject.cpp:1690"
125125
./cppcheck -q --template=selfcheck --error-exitcode=1 --library=cppcheck-lib -D__CPPCHECK__ -D__GNUC__ --enable=unusedFunction,information --exception-handling -rp=. --project=cmake.output.notest_nogui/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr $supprs
126126
env:
127127
DISABLE_VALUEFLOW: 1

.selfcheck_suppressions

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,3 +78,4 @@ knownConditionTrueFalse:externals/tinyxml2/tinyxml2.cpp
7878
useStlAlgorithm:externals/simplecpp/simplecpp.cpp
7979
funcArgNamesDifferentUnnamed:externals/simplecpp/simplecpp.h
8080
missingMemberCopy:externals/simplecpp/simplecpp.h
81+
shadowFunction:externals/simplecpp/simplecpp.h

AUTHORS

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Alexey Eryomenko
2222
Alexey Zhikhartsev
2323
Alfi Maulana
2424
Ali Can Demiralp
25+
Alvin Che-Chia Chang
2526
Allen Winter
2627
Alon Alexander
2728
Alon Liberman
@@ -33,6 +34,7 @@ Andreas Lutsch
3334
Andreas Pokorny
3435
Andreas Rönnquist
3536
Andreas Vollenweider
37+
Andreas Wilhelm
3638
Andrei Karas
3739
Andrew C Aitchison
3840
Andrew C. Martin
@@ -105,6 +107,7 @@ Debrard Sebastien
105107
Deepak Gupta
106108
Degen's Regens
107109
dencat
110+
Devansh Varshney
108111
Diego de las Heras
109112
Dirk Jagdmann
110113
Dirk Mueller
@@ -140,6 +143,7 @@ Frank Winklmeier
140143
Frank Zingsheim
141144
Frederik Schwarzer
142145
fu7mu4
146+
Gaël Bonithon
143147
Galimov Albert
144148
Garrett Bodily
145149
Gary Leutheuser
@@ -326,6 +330,7 @@ Philip Chimento
326330
Philipp Kloke
327331
Pierre Schweitzer
328332
Pieter Duchi
333+
Piotr Idzik
329334
Pino Toscano
330335
Pranav Khanna
331336
Radek Jarecki
@@ -433,6 +438,7 @@ Vladimir Petrigo
433438
Wang Haoyu
434439
Wang Yang
435440
WenChung Chiu
441+
William Jakobsson
436442
Wolfgang Stöggl
437443
x29a
438444
XhmikosR

0 commit comments

Comments
 (0)