Skip to content

Commit 563c65d

Browse files
ChristophStrehleChristophStrehle
authored
Merge branch 'danmar:main' into master
2 parents ca66615 + 2924622 commit 563c65d

39 files changed

+325
-92
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
runs-on: ${{ matrix.os }}
3535

3636
steps:
37-
- uses: actions/checkout@v3
37+
- uses: actions/checkout@v4
3838

3939
- name: Set up Cygwin
4040
uses: cygwin/cygwin-install-action@master

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
runs-on: ${{ matrix.os }}
3131

3232
steps:
33-
- uses: actions/checkout@v3
33+
- uses: actions/checkout@v4
3434

3535
- name: Set up MSYS2
3636
uses: msys2/setup-msys2@v2

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

+4
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ jobs:
3737
image: ${{ matrix.image }}
3838

3939
steps:
40+
# we need to stay at v3 for now because Node 20 does not support the older distros
41+
# /__e/node20/bin/node: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.28' not found (required by /__e/node20/bin/node)
4042
- uses: actions/checkout@v3
4143

4244
- name: Install missing software on ubuntu
@@ -101,6 +103,8 @@ jobs:
101103
image: ${{ matrix.image }}
102104

103105
steps:
106+
# we need to stay at v3 for now because Node 20 does not support the older distros
107+
# /__e/node20/bin/node: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.28' not found (required by /__e/node20/bin/node)
104108
- uses: actions/checkout@v3
105109

106110
- name: Install missing software on ubuntu

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
CCACHE_SLOPPINESS: pch_defines,time_macros
3434

3535
steps:
36-
- uses: actions/checkout@v3
36+
- uses: actions/checkout@v4
3737

3838
- name: ccache
3939
uses: hendrikmuhs/[email protected]
@@ -95,7 +95,7 @@ jobs:
9595
CCACHE_SLOPPINESS: pch_defines,time_macros
9696

9797
steps:
98-
- uses: actions/checkout@v3
98+
- uses: actions/checkout@v4
9999

100100
- name: ccache
101101
uses: hendrikmuhs/[email protected]
@@ -168,7 +168,7 @@ jobs:
168168
runs-on: ${{ matrix.os }}
169169

170170
steps:
171-
- uses: actions/checkout@v3
171+
- uses: actions/checkout@v4
172172

173173
- name: ccache
174174
uses: hendrikmuhs/[email protected]
@@ -200,7 +200,7 @@ jobs:
200200
runs-on: ${{ matrix.os }}
201201

202202
steps:
203-
- uses: actions/checkout@v3
203+
- uses: actions/checkout@v4
204204

205205
- name: ccache
206206
uses: hendrikmuhs/[email protected]
@@ -232,7 +232,7 @@ jobs:
232232
runs-on: ${{ matrix.os }}
233233

234234
steps:
235-
- uses: actions/checkout@v3
235+
- uses: actions/checkout@v4
236236

237237
# coreutils contains "g++" (default is "c++") and "nproc"
238238
- name: Install missing software on macos
@@ -255,7 +255,7 @@ jobs:
255255
runs-on: ${{ matrix.os }}
256256

257257
steps:
258-
- uses: actions/checkout@v3
258+
- uses: actions/checkout@v4
259259

260260
- name: Install missing software on ubuntu
261261
if: contains(matrix.os, 'ubuntu')
@@ -342,7 +342,7 @@ jobs:
342342
runs-on: ${{ matrix.os }}
343343

344344
steps:
345-
- uses: actions/checkout@v3
345+
- uses: actions/checkout@v4
346346

347347
- name: ccache
348348
uses: hendrikmuhs/[email protected]
@@ -502,7 +502,7 @@ jobs:
502502
runs-on: ubuntu-22.04 # run on the latest image only
503503

504504
steps:
505-
- uses: actions/checkout@v3
505+
- uses: actions/checkout@v4
506506

507507
- name: ccache
508508
uses: hendrikmuhs/[email protected]

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: ${{ matrix.os }}
3333

3434
steps:
35-
- uses: actions/checkout@v3
35+
- uses: actions/checkout@v4
3636

3737
- name: Set up Visual Studio environment
3838
uses: ilammy/msvc-dev-cmd@v1
@@ -84,13 +84,13 @@ jobs:
8484
PCRE_VERSION: 8.45
8585

8686
steps:
87-
- uses: actions/checkout@v3
87+
- uses: actions/checkout@v4
8888

89-
- name: Set up Python 3.12
89+
- name: Set up Python 3.12.3
9090
if: matrix.config == 'release'
9191
uses: actions/setup-python@v5
9292
with:
93-
python-version: '3.12'
93+
python-version: '3.12.3'
9494
check-latest: true
9595

9696
- name: Set up Visual Studio environment

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@ jobs:
2626
CCACHE_SLOPPINESS: pch_defines,time_macros
2727

2828
steps:
29-
- uses: actions/checkout@v3
29+
- uses: actions/checkout@v4
3030

3131
- name: ccache
3232
uses: hendrikmuhs/[email protected]
3333
with:
3434
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
3535

36-
- name: Set up Python 3.12
36+
- name: Set up Python 3.12.3
3737
uses: actions/setup-python@v5
3838
with:
39-
python-version: '3.12'
39+
python-version: '3.12.3'
4040
check-latest: true
4141

4242
- name: Install missing software on ubuntu

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
convert_via_pandoc:
1919
runs-on: ubuntu-22.04
2020
steps:
21-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4
2222

2323
- run: |
2424
mkdir output
@@ -43,7 +43,7 @@ jobs:
4343
manpage:
4444
runs-on: ubuntu-22.04
4545
steps:
46-
- uses: actions/checkout@v3
46+
- uses: actions/checkout@v4
4747

4848
- name: Install missing software on ubuntu
4949
run: |

Diff for: ‎.github/workflows/clang-tidy.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
QT_VERSION: 6.7.0
2424

2525
steps:
26-
- uses: actions/checkout@v3
26+
- uses: actions/checkout@v4
2727

2828
- name: Install missing software
2929
run: |

Diff for: ‎.github/workflows/codeql-analysis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131

3232
steps:
3333
- name: Checkout repository
34-
uses: actions/checkout@v3
34+
uses: actions/checkout@v4
3535

3636
- name: Install missing software on ubuntu
3737
run: |

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
if: false # ${{ github.repository_owner == 'danmar' }}
2323

2424
steps:
25-
- uses: actions/checkout@v3
25+
- uses: actions/checkout@v4
2626

2727
- name: ccache
2828
uses: hendrikmuhs/[email protected]

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@ jobs:
2222

2323
build:
2424
runs-on: ubuntu-22.04 # run on the latest image only
25-
25+
# FIXME: enable after update
26+
if: false
2627
steps:
27-
- uses: actions/checkout@v3
28+
- uses: actions/checkout@v4
2829

2930
- name: Download cppcheckpremium
3031
run: |

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ubuntu-22.04
2121

2222
steps:
23-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
2424

2525
- name: Cache uncrustify
2626
uses: actions/cache@v4

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
QT_VERSION: 6.7.0
2828

2929
steps:
30-
- uses: actions/checkout@v3
30+
- uses: actions/checkout@v4
3131

3232
- name: Install missing software on debian/ubuntu
3333
if: contains(matrix.image, 'debian')
@@ -134,7 +134,7 @@ jobs:
134134
QT_VERSION: 6.7.0
135135

136136
steps:
137-
- uses: actions/checkout@v3
137+
- uses: actions/checkout@v4
138138

139139
- name: Install missing software
140140
run: |

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
QT_VERSION: 5.15.2
3131

3232
steps:
33-
- uses: actions/checkout@v3
33+
- uses: actions/checkout@v4
3434

3535
- name: Set up Visual Studio environment
3636
uses: ilammy/msvc-dev-cmd@v1

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-20.04
2222

2323
steps:
24-
- uses: actions/checkout@v3
24+
- uses: actions/checkout@v4
2525

2626
- name: ccache
2727
uses: hendrikmuhs/[email protected]
@@ -47,15 +47,15 @@ jobs:
4747
runs-on: ubuntu-20.04
4848
strategy:
4949
matrix:
50-
python-version: [3.6, 3.7, 3.8, 3.9, '3.10', '3.11', '3.12']
50+
python-version: [3.6, 3.7, 3.8, 3.9, '3.10', '3.11', '3.12.3']
5151
include:
52-
- python-version: '3.12'
52+
- python-version: '3.12.3'
5353
python-latest: true
5454

5555
fail-fast: false
5656

5757
steps:
58-
- uses: actions/checkout@v3
58+
- uses: actions/checkout@v4
5959

6060
- name: Restore Cppcheck
6161
uses: actions/cache@v4
@@ -189,7 +189,7 @@ jobs:
189189
runs-on: ${{ matrix.os }}
190190

191191
steps:
192-
- uses: actions/checkout@v3
192+
- uses: actions/checkout@v4
193193

194194
- name: run dmake
195195
run: |

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
QT_VERSION: 6.7.0
2424

2525
steps:
26-
- uses: actions/checkout@v3
26+
- uses: actions/checkout@v4
2727

2828
- name: Install missing software
2929
run: |

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@ jobs:
2626
CCACHE_SLOPPINESS: pch_defines,time_macros
2727

2828
steps:
29-
- uses: actions/checkout@v3
29+
- uses: actions/checkout@v4
3030

3131
- name: ccache
3232
uses: hendrikmuhs/[email protected]
3333
with:
3434
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
3535

36-
- name: Set up Python 3.12
36+
- name: Set up Python 3.12.3
3737
uses: actions/setup-python@v5
3838
with:
39-
python-version: '3.12'
39+
python-version: '3.12.3'
4040
check-latest: true
4141

4242
- name: Install missing software on ubuntu

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@ jobs:
2626
CCACHE_SLOPPINESS: pch_defines,time_macros
2727

2828
steps:
29-
- uses: actions/checkout@v3
29+
- uses: actions/checkout@v4
3030

3131
- name: ccache
3232
uses: hendrikmuhs/[email protected]
3333
with:
3434
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
3535

36-
- name: Set up Python 3.12
36+
- name: Set up Python 3.12.3
3737
uses: actions/setup-python@v5
3838
with:
39-
python-version: '3.12'
39+
python-version: '3.12.3'
4040
check-latest: true
4141

4242
- name: Install missing software on ubuntu

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ubuntu-22.04
2121

2222
steps:
23-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
2424

2525
- name: ccache
2626
uses: hendrikmuhs/[email protected]

Diff for: ‎cfg/cppcheck-cfg.rng

+5
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,11 @@
252252
<ref name="ARG-DIRECTION"/>
253253
</attribute>
254254
</optional>
255+
<optional>
256+
<attribute name="indirect">
257+
<ref name="INDIRECT"/>
258+
</attribute>
259+
</optional>
255260

256261
<interleave>
257262
<optional>

0 commit comments

Comments
 (0)