Skip to content

Commit 6f50382

Browse files
winterzwinterz
authored
Merge branch 'danmar:main' into main
2 parents 68ea067 + 129055d commit 6f50382

205 files changed

Lines changed: 11662 additions & 7789 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Checks: >
7070
-readability-suspicious-call-argument,
7171
-readability-uppercase-literal-suffix
7272
WarningsAsErrors: '*'
73-
HeaderFilterRegex: '(cli|gui|lib|oss-fuzz|test|triage)\/[a-z_]+\.h'
73+
HeaderFilterRegex: '(cli|gui|frontend|lib|oss-fuzz|test|triage)\/[a-z_]+\.h'
7474
ExcludeHeaderFilterRegex: 'ui_.*.h'
7575
CheckOptions:
7676
- key: misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ jobs:
2424
build_cygwin:
2525
strategy:
2626
matrix:
27-
os: [windows-2022]
27+
# only use the latest windows-* as the installed toolchain is identical
28+
os: [windows-2025]
2829
platform: [x86_64]
2930
include:
3031
- platform: 'x86_64'

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@ jobs:
2424
build_mingw:
2525
strategy:
2626
matrix:
27-
# the MinGW installation in windows-2019 is supposed to be 8.1 but it is 12.2
28-
# the MinGW installation in windows-2022 is not including all necessary packages by default, so just use the older image instead - package versions are he same
29-
os: [windows-2019]
27+
# only use the latest windows-* as the installed toolchain is identical
28+
os: [windows-2025]
3029
fail-fast: false
3130

3231
runs-on: ${{ matrix.os }}
@@ -40,9 +39,12 @@ jobs:
4039
uses: msys2/setup-msys2@v2
4140
with:
4241
release: false # use pre-installed
42+
# TODO: install mingw-w64-x86_64-make and use mingw32.make instead - currently fails with "Windows Subsystem for Linux has no installed distributions."
4343
install: >-
4444
mingw-w64-x86_64-lld
4545
mingw-w64-x86_64-ccache
46+
make
47+
mingw-w64-x86_64-gcc
4648
4749
- name: ccache
4850
uses: hendrikmuhs/ccache-action@v1.2

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -523,13 +523,15 @@ jobs:
523523
./cppcheck $selfcheck_options externals || ec=1
524524
# self check lib/cli
525525
mkdir b1
526-
./cppcheck $selfcheck_options $cppcheck_options --cppcheck-build-dir=b1 --addon=naming.json cli || ec=1
526+
./cppcheck $selfcheck_options $cppcheck_options --cppcheck-build-dir=b1 --addon=naming.json frontend || ec=1
527+
./cppcheck $selfcheck_options $cppcheck_options --cppcheck-build-dir=b1 --addon=naming.json -Ifrontend cli || ec=1
527528
./cppcheck $selfcheck_options $cppcheck_options --cppcheck-build-dir=b1 --addon=naming.json --enable=internal lib || ec=1
528529
# check gui with qt settings
529530
mkdir b2
530-
./cppcheck $selfcheck_options $cppcheck_options --cppcheck-build-dir=b2 -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=68 -DQT_CHARTS_LIB --library=qt --addon=naming.json -Icmake.output/gui -Igui gui/*.cpp cmake.output/gui || ec=1
531+
./cppcheck $selfcheck_options $cppcheck_options --cppcheck-build-dir=b2 -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=68 -DQT_CHARTS_LIB --library=qt --addon=naming.json -Icmake.output/gui -Ifrontend -Igui gui/*.cpp cmake.output/gui || ec=1
531532
# self check test and tools
532-
./cppcheck $selfcheck_options $cppcheck_options -Icli test/*.cpp tools/dmake/*.cpp || ec=1
533+
./cppcheck $selfcheck_options $cppcheck_options -Ifrontend -Icli test/*.cpp || ec=1
534+
./cppcheck $selfcheck_options $cppcheck_options -Icli tools/dmake/*.cpp || ec=1
533535
# triage
534536
./cppcheck $selfcheck_options $cppcheck_options -DQ_MOC_OUTPUT_REVISION=68 -DQT_CHARTS_LIB --library=qt -Icmake.output/tools/triage -Igui tools/triage/*.cpp cmake.output/tools/triage || ec=1
535537
exit $ec

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ jobs:
2626
build_qt:
2727
strategy:
2828
matrix:
29-
os: [windows-2019, windows-2022]
30-
qt_ver: [5.15.2, 6.8.2]
29+
os: [windows-2022, windows-2025]
30+
qt_ver: [5.15.2, 6.9.0]
3131
fail-fast: false
3232

3333
runs-on: ${{ matrix.os }}
@@ -84,7 +84,7 @@ jobs:
8484
build:
8585
strategy:
8686
matrix:
87-
os: [windows-2019, windows-2022]
87+
os: [windows-2022, windows-2025]
8888
config: [debug, release]
8989
fail-fast: false
9090

‎.github/workflows/asan.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-22.04
2222

2323
env:
24-
QT_VERSION: 6.8.2
24+
QT_VERSION: 6.9.0
2525
ASAN_OPTIONS: detect_stack_use_after_return=1
2626
# TODO: figure out why there are cache misses with PCH enabled
2727
CCACHE_SLOPPINESS: pch_defines,time_macros
@@ -145,9 +145,11 @@ jobs:
145145
cppcheck_options="-D__CPPCHECK__ -DCHECK_INTERNAL -DHAVE_RULES --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2"
146146
ec=0
147147
./cmake.output/bin/cppcheck $selfcheck_options externals || ec=1
148-
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json cli || ec=1
148+
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json frontend || ec=1
149+
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json -Ifrontend cli || ec=1
149150
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json --enable=internal lib || ec=1
150-
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=68 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --library=qt --addon=naming.json -Icmake.output/gui -Igui gui/*.cpp cmake.output/gui/*.cpp || ec=1
151-
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -Icli test/*.cpp tools/dmake/*.cpp || ec=1
152-
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -DQ_MOC_OUTPUT_REVISION=68 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --library=qt -Icmake.output/tools/triage -Igui tools/triage/*.cpp cmake.output/tools/triage/*.cpp || ec=1
151+
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --library=qt --addon=naming.json -Icmake.output/gui -Ifrontend -Igui gui/*.cpp cmake.output/gui/*.cpp || ec=1
152+
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -Icli -Ifrontend test/*.cpp || ec=1
153+
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -Icli tools/dmake/*.cpp || ec=1
154+
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --library=qt -Icmake.output/tools/triage -Igui tools/triage/*.cpp cmake.output/tools/triage/*.cpp || ec=1
153155
exit $ec

‎.github/workflows/clang-tidy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
runs-on: ubuntu-22.04
2525

2626
env:
27-
QT_VERSION: 6.8.2
27+
QT_VERSION: 6.9.0
2828

2929
steps:
3030
- uses: actions/checkout@v4

‎.github/workflows/iwyu.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
image: ${{ matrix.image }}
3737

3838
env:
39-
QT_VERSION: 6.8.2
39+
QT_VERSION: 6.9.0
4040

4141
steps:
4242
- uses: actions/checkout@v4
@@ -184,7 +184,7 @@ jobs:
184184
if: ${{ github.repository_owner == 'danmar' }}
185185

186186
env:
187-
QT_VERSION: 6.8.2
187+
QT_VERSION: 6.9.0
188188

189189
steps:
190190
- uses: actions/checkout@v4

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ jobs:
2121

2222
build:
2323

24-
runs-on: windows-2022
24+
runs-on: windows-2025
2525
if: ${{ github.repository_owner == 'danmar' }}
2626

2727
env:
2828
# see https://www.pcre.org/original/changelog.txt
2929
PCRE_VERSION: 8.45
30-
QT_VERSION: 6.8.2
30+
QT_VERSION: 6.9.0
3131

3232
steps:
3333
- uses: actions/checkout@v4
@@ -121,7 +121,6 @@ jobs:
121121
@echo on
122122
move build\bin\Release win_installer\files || exit /b !errorlevel!
123123
copy AUTHORS win_installer\files\authors.txt || exit /b !errorlevel!
124-
copy readme.txt win_installer\files\ || exit /b !errorlevel!
125124
copy win_installer\GPLv3.txt win_installer\files\ || exit /b !errorlevel!
126125
copy externals\picojson\LICENSE win_installer\files\picojson-license.txt || exit /b !errorlevel!
127126
copy externals\simplecpp\LICENSE win_installer\files\simplecpp-license.txt || exit /b !errorlevel!

‎.github/workflows/scriptcheck.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ jobs:
203203
dmake:
204204
strategy:
205205
matrix:
206-
os: [ubuntu-22.04, macos-13, windows-2022]
206+
os: [ubuntu-22.04, macos-13, windows-2025]
207207
fail-fast: false
208208

209209
runs-on: ${{ matrix.os }}

0 commit comments

Comments
 (0)