Skip to content

Commit 4210f90

Browse files
chrchr-githubchrchr-github
committed
Merge branch 'main' into chr_12661
2 parents a2405dd + dc385f3 commit 4210f90

File tree

131 files changed

+3085
-1832
lines changed

Some content is hidden

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

131 files changed

+3085
-1832
lines changed

Diff for: ‎.github/workflows/CI-unixish.yml

+7
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,12 @@ jobs:
303303
make -j$(nproc)
304304
./test-projectfile
305305
popd
306+
pushd gui/test/resultstree
307+
qmake CONFIG+=debug CONFIG+=ccache
308+
make -j$(nproc)
309+
export QT_QPA_PLATFORM=offscreen
310+
./test-resultstree
311+
popd
306312
pushd gui/test/translationhandler
307313
qmake CONFIG+=debug CONFIG+=ccache
308314
make -j$(nproc)
@@ -367,6 +373,7 @@ jobs:
367373
python3 -m pip install pip --upgrade
368374
python3 -m pip install pytest
369375
python3 -m pip install pytest-timeout
376+
python3 -m pip install psutil
370377
371378
- name: Build cppcheck
372379
run: |

Diff for: ‎.github/workflows/CI-windows.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888

8989
- name: Set up Python 3.12
9090
if: matrix.config == 'release'
91-
uses: actions/setup-python@v4
91+
uses: actions/setup-python@v5
9292
with:
9393
python-version: '3.12'
9494
check-latest: true
@@ -100,7 +100,7 @@ jobs:
100100

101101
- name: Cache PCRE
102102
id: cache-pcre
103-
uses: actions/cache@v3
103+
uses: actions/cache@v4
104104
with:
105105
path: |
106106
externals\pcre.h
@@ -132,6 +132,7 @@ jobs:
132132
python -m pip install pytest || exit /b !errorlevel!
133133
python -m pip install pytest-custom_exit_code || exit /b !errorlevel!
134134
python -m pip install pytest-timeout || exit /b !errorlevel!
135+
python -m pip install psutil || exit /b !errorlevel!
135136
136137
- name: Run CMake
137138
if: false # TODO: enable

Diff for: ‎.github/workflows/asan.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
3535

3636
- name: Set up Python 3.12
37-
uses: actions/setup-python@v4
37+
uses: actions/setup-python@v5
3838
with:
3939
python-version: '3.12'
4040
check-latest: true
@@ -64,6 +64,7 @@ jobs:
6464
python3 -m pip install pip --upgrade
6565
python3 -m pip install pytest
6666
python3 -m pip install pytest-timeout
67+
python3 -m pip install psutil
6768
6869
# TODO: disable all warnings
6970
- name: CMake

Diff for: ‎.github/workflows/buildman.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
with:
3636
args: --output=output/manual-premium.pdf man/manual-premium.md
3737

38-
- uses: actions/upload-artifact@v3
38+
- uses: actions/upload-artifact@v4
3939
with:
4040
name: output
4141
path: output
@@ -54,7 +54,7 @@ jobs:
5454
run: |
5555
make man
5656
57-
- uses: actions/upload-artifact@v3
57+
- uses: actions/upload-artifact@v4
5858
with:
5959
name: cppcheck.1
6060
path: cppcheck.1

Diff for: ‎.github/workflows/cifuzz.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
dry-run: false
2828
language: c++
2929
- name: Upload Crash
30-
uses: actions/upload-artifact@v3
30+
uses: actions/upload-artifact@v4
3131
if: failure() && steps.build.outcome == 'success'
3232
with:
3333
name: artifacts

Diff for: ‎.github/workflows/coverage.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
lcov --extract lcov_tmp.info "$(pwd)/*" --output-file lcov.info
5757
genhtml lcov.info -o coverage_report --frame --legend --demangle-cpp
5858
59-
- uses: actions/upload-artifact@v3
59+
- uses: actions/upload-artifact@v4
6060
with:
6161
name: Coverage results
6262
path: coverage_report

Diff for: ‎.github/workflows/cppcheck-premium.yml

+15-8
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ on:
1010
tags:
1111
- '2.*'
1212
pull_request:
13+
workflow_dispatch:
14+
inputs:
15+
premium_version:
16+
description: 'Cppcheck Premium version'
1317

1418
permissions:
1519
contents: read
@@ -18,17 +22,20 @@ jobs:
1822

1923
build:
2024
runs-on: ubuntu-22.04 # run on the latest image only
21-
22-
env:
23-
PREMIUM_VERSION: 24.2.0
24-
25+
# FIXME: enable after update
26+
if: false
2527
steps:
2628
- uses: actions/checkout@v3
2729

2830
- name: Download cppcheckpremium
2931
run: |
30-
wget https://files.cppchecksolutions.com/${{ env.PREMIUM_VERSION }}/ubuntu-22.04/cppcheckpremium-${{ env.PREMIUM_VERSION }}-amd64.tar.gz
31-
tar xzf cppcheckpremium-${{ env.PREMIUM_VERSION }}-amd64.tar.gz
32+
premium_version=${{ inputs.premium_version }}
33+
if [ -z $premium_version ]; then
34+
premium_version=24.2.0
35+
fi
36+
wget https://files.cppchecksolutions.com/$premium_version/ubuntu-22.04/cppcheckpremium-$premium_version-amd64.tar.gz -O cppcheckpremium.tar.gz
37+
tar xvzf cppcheckpremium.tar.gz
38+
mv cppcheckpremium-$premium_version cppcheckpremium
3239
3340
- name: Generate a license file
3441
run: |
@@ -40,5 +47,5 @@ jobs:
4047
4148
- name: Check
4249
run: |
43-
cppcheckpremium-${{ env.PREMIUM_VERSION }}/premiumaddon --check-loc-license cppcheck.lic > cppcheck-premium-loc
44-
cppcheckpremium-${{ env.PREMIUM_VERSION }}/cppcheck -j$(nproc) -D__GNUC__ -D__CPPCHECK__ --suppressions-list=cppcheckpremium-suppressions --platform=unix64 --enable=style --premium=misra-c++-2008 --premium=cert-c++-2016 --inline-suppr --error-exitcode=1 lib
50+
cppcheckpremium/premiumaddon --check-loc-license cppcheck.lic > cppcheck-premium-loc
51+
cppcheckpremium/cppcheck -j$(nproc) -D__GNUC__ -D__CPPCHECK__ --suppressions-list=cppcheckpremium-suppressions --platform=unix64 --enable=style --premium=misra-c++-2008 --premium=cert-c++-2016 --inline-suppr --error-exitcode=1 lib

Diff for: ‎.github/workflows/format.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- uses: actions/checkout@v3
2424

2525
- name: Cache uncrustify
26-
uses: actions/cache@v3
26+
uses: actions/cache@v4
2727
id: cache-uncrustify
2828
with:
2929
path: |

Diff for: ‎.github/workflows/iwyu.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,13 @@ jobs:
113113
# -isystem/usr/lib/clang/17/include
114114
iwyu_tool -p cmake.output -j $(nproc) -- -w -Xiwyu --max_line_length=1024 -Xiwyu --comment_style=long -Xiwyu --quoted_includes_first -Xiwyu --update_comments > iwyu.log
115115
116-
- uses: actions/upload-artifact@v3
116+
- uses: actions/upload-artifact@v4
117117
if: success() || failure()
118118
with:
119119
name: Compilation Database
120120
path: ./cmake.output/compile_commands.json
121121

122-
- uses: actions/upload-artifact@v3
122+
- uses: actions/upload-artifact@v4
123123
if: success() || failure()
124124
with:
125125
name: Logs (include-what-you-use)
@@ -182,7 +182,7 @@ jobs:
182182
# TODO: run multi-threaded
183183
find $PWD/cli $PWD/lib $PWD/test $PWD/gui -maxdepth 1 -name "*.cpp" | xargs -t -n 1 clang-include-cleaner-18 --print=changes --extra-arg=-w -p cmake.output > clang-include-cleaner.log 2>&1
184184
185-
- uses: actions/upload-artifact@v3
185+
- uses: actions/upload-artifact@v4
186186
with:
187187
name: Logs (clang-include-cleaner)
188188
path: ./*.log

Diff for: ‎.github/workflows/release-windows.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737

3838
- name: Cache PCRE
3939
id: cache-pcre
40-
uses: actions/cache@v3
40+
uses: actions/cache@v4
4141
with:
4242
path: |
4343
externals\pcre.h
@@ -133,12 +133,12 @@ jobs:
133133
echo ProductVersion="%PRODUCTVER%" || exit /b !errorlevel!
134134
msbuild -m cppcheck.wixproj -p:Platform=x64,ProductVersion=%PRODUCTVER%.${{ github.run_number }} || exit /b !errorlevel!
135135
136-
- uses: actions/upload-artifact@v3
136+
- uses: actions/upload-artifact@v4
137137
with:
138138
name: installer
139139
path: win_installer/Build/
140140

141-
- uses: actions/upload-artifact@v3
141+
- uses: actions/upload-artifact@v4
142142
with:
143143
name: deploy
144144
path: win_installer\files
@@ -162,7 +162,7 @@ jobs:
162162
del win_installer\files\Qt5Svg.dll || exit /b !errorlevel!
163163
del win_installer\files\vc_redist.x64.exe || exit /b !errorlevel!
164164
165-
- uses: actions/upload-artifact@v3
165+
- uses: actions/upload-artifact@v4
166166
with:
167167
name: portable
168168
path: win_installer\files

Diff for: ‎.github/workflows/scriptcheck.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
key: ${{ github.workflow }}-${{ runner.os }}
3030

3131
- name: Cache Cppcheck
32-
uses: actions/cache@v3
32+
uses: actions/cache@v4
3333
with:
3434
path: cppcheck
3535
key: ${{ runner.os }}-scriptcheck-cppcheck-${{ github.sha }}
@@ -58,13 +58,13 @@ jobs:
5858
- uses: actions/checkout@v3
5959

6060
- name: Restore Cppcheck
61-
uses: actions/cache@v3
61+
uses: actions/cache@v4
6262
with:
6363
path: cppcheck
6464
key: ${{ runner.os }}-scriptcheck-cppcheck-${{ github.sha }}
6565

6666
- name: Set up Python ${{ matrix.python-version }}
67-
uses: actions/setup-python@v4
67+
uses: actions/setup-python@v5
6868
with:
6969
python-version: ${{ matrix.python-version }}
7070
check-latest: true

Diff for: ‎.github/workflows/selfcheck.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ jobs:
129129
env:
130130
DISABLE_VALUEFLOW: 1
131131

132-
- uses: actions/upload-artifact@v3
132+
- uses: actions/upload-artifact@v4
133133
with:
134134
name: Callgrind Output
135135
path: ./callgrind.*

Diff for: ‎.github/workflows/tsan.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
3535

3636
- name: Set up Python 3.12
37-
uses: actions/setup-python@v4
37+
uses: actions/setup-python@v5
3838
with:
3939
python-version: '3.12'
4040
check-latest: true
@@ -64,6 +64,7 @@ jobs:
6464
python3 -m pip install pip --upgrade
6565
python3 -m pip install pytest
6666
python3 -m pip install pytest-timeout
67+
python3 -m pip install psutil
6768
6869
- name: CMake
6970
run: |

Diff for: ‎.github/workflows/ubsan.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
3535

3636
- name: Set up Python 3.12
37-
uses: actions/setup-python@v4
37+
uses: actions/setup-python@v5
3838
with:
3939
python-version: '3.12'
4040
check-latest: true
@@ -63,6 +63,7 @@ jobs:
6363
python3 -m pip install pip --upgrade
6464
python3 -m pip install pytest
6565
python3 -m pip install pytest-timeout
66+
python3 -m pip install psutil
6667
6768
# TODO: disable warnings
6869
- name: CMake

Diff for: ‎.github/workflows/valgrind.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
#env:
5656
# DEBUGINFOD_URLS: https://debuginfod.ubuntu.com
5757

58-
- uses: actions/upload-artifact@v3
58+
- uses: actions/upload-artifact@v4
5959
if: success() || failure()
6060
with:
6161
name: Logs

Diff for: ‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -142,3 +142,6 @@ compile_commands.json
142142

143143
# cppcheck-htmlreport auto files
144144
/htmlreport/cppcheck_htmlreport/run.py
145+
146+
# GDB configuration
147+
.gdbinit

0 commit comments

Comments
 (0)