Skip to content

Commit bc909e5

Browse files
committed
CI: nigtly fix
1 parent 5e7069d commit bc909e5

9 files changed

Lines changed: 35 additions & 34 deletions

File tree

.clang-tidy

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
Checks: 'clang-diagnostic-*,clang-analyzer-*,-clang-analyzer-alpha*,*,-google-*,-cppcoreguidelines-*,-readability-else-after-return,-readability-implicit-bool-cast,-llvm-include-order,-readability-named-parameter,-readabilty-namespace-comments,-llvm-namespace-comment,-clang-analyzer-alpha.core.CastToStruct,-modernize-use-override,-modernize-use-bool-literals,-clang-analyzer-cplusplus.NewDeleteLeaks,-clang-analyzer-alpha.deadcode.UnreachableCode,-modernize-use-default,-clang-analyzer-core.CallAndMessage,-modernize-pass-by-value,-clang-analyzer-core.NonNullParamChecker,-modernize-raw-string-literal,-modernize-use-using,-modernize-loop-convert,-modernize-use-emplace,-modernize-return-braced-init-list,-modernize-use-default-member-init,-modernize-use-equals-default,-fuchsia-*,-hicpp-*,-readability-implicit-bool-conversion,-llvm-*,-llvmlibc-*,-modernize-use-trailing-return-type,-readability-magic-numbers,-readability-qualified-auto,-clang-diagnostic-gnu-zero-variadic-macro-arguments,-android-*,-misc-no-recursion,-modernize-avoid-c-arrays,-misc-non-private-member-variables-in-classes,-readability-redundant-access-specifiers'
3+
WarningsAsErrors: ''
4+
HeaderFilterRegex: ''
5+
CheckOptions:
6+
- key: cert-oop11-cpp.UseCERTSemantics
7+
value: '1'
8+
- key: modernize-loop-convert.MaxCopySize
9+
value: '16'
10+
- key: modernize-loop-convert.MinConfidence
11+
value: reasonable
12+
- key: modernize-loop-convert.NamingStyle
13+
value: CamelCase
14+
- key: modernize-pass-by-value.IncludeStyle
15+
value: llvm
16+
- key: modernize-replace-auto-ptr.IncludeStyle
17+
value: llvm
18+
- key: modernize-use-nullptr.NullMacros
19+
value: 'NULL'
20+
- key: readability-braces-around-statements.ShortStatementLines
21+
value: '3'
22+
...

.github/workflows/nightly.yml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,7 @@ jobs:
2525
- cppcheck
2626

2727
steps:
28-
- name: Install Qt ${{ matrix.config.qt_version }} with options and default aqtversion
29-
uses: jurplel/install-qt-action@v4
30-
with:
31-
version: ${{ matrix.config.qt_version }}
32-
cache: true
33-
34-
- name: Install ninja-build tool (must be after Qt due PATH changes)
28+
- name: Install ninja-build tool
3529
uses: turtlesec-no/get-ninja@main
3630

3731
- name: Install dependencies on Ubuntu (${{ join(matrix.config.apt_pgks, ' ') }})
@@ -41,12 +35,6 @@ jobs:
4135
echo ${{ join(matrix.config.apt_pgks, ' ') }} | xargs sudo apt install -y
4236
4337
- uses: actions/checkout@v4
44-
#with:
45-
#ref: '2.0' # schedule.cron do not allow branch setting
46-
47-
- name: Make sure MSVC is found when Ninja generator is in use
48-
if: ${{ runner.os == 'Windows' }}
49-
uses: ilammy/msvc-dev-cmd@v1
5038

5139
- name: Configure project
5240
run: cmake --preset=${{ matrix.config.preset }}
@@ -55,12 +43,6 @@ jobs:
5543
id: ctest
5644
run: cmake --build --preset=${{ matrix.config.preset }}
5745

58-
- name: Read tests log when it fails
59-
uses: andstor/file-reader-action@v1
60-
if: ${{ steps.ctest.conclusion == 'failure' }}
61-
with:
62-
path: "./build/Testing/Temporary/LastTest.log"
63-
6446
- name: Run cppcheck
6547
if: ${{ matrix.config.preset == 'clang-tidy' }}
6648
run: cmake --build --preset=${{ matrix.config.preset }} --target cppcheck

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,5 @@ add_custom_target(cppcheck
6767
--check-level=exhaustive
6868
--library=qt.cfg
6969
"-i${CMAKE_CURRENT_BINARY_DIR}/_deps/"
70-
"--suppress=*:${CMAKE_CURRENT_BINARY_DIR}/_deps/*"
70+
"--suppress=*:${CMAKE_CURRENT_BINARY_DIR}/_deps/"
7171
)

CMakePresets.json

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -110,15 +110,13 @@
110110
"name":"ci",
111111
"inherits":"ci-base"
112112
},
113-
{
114-
"name":"clazy",
115-
"inherits":"ci-base"
116-
},
117113
{
118114
"name":"clang-tidy",
119115
"inherits":"ci-base",
120116
"cacheVariables":{
121-
"CMAKE_CXX_CLANG_TIDY":"clang-tidy"
117+
"CMAKE_CXX_CLANG_TIDY":"clang-tidy;--config-file=${sourceDir}/.clang-tidy",
118+
"CMAKE_COMPILE_WARNING_AS_ERROR":"OFF",
119+
"KDSPDSETUP_BUILD_DOCS":"OFF"
122120
}
123121
}
124122
],
@@ -127,14 +125,6 @@
127125
"name":"ci",
128126
"configurePreset":"ci"
129127
},
130-
{
131-
"name":"clazy",
132-
"configurePreset":"clazy",
133-
"environment":{
134-
"CLAZY_CHECKS":"level2,no-qstring-allocations,no-fully-qualified-moc-types,no-copyable-polymorphic",
135-
"CCACHE_DISABLE":"ON"
136-
}
137-
},
138128
{
139129
"name":"clang-tidy",
140130
"configurePreset":"clang-tidy"

cmake/dependencies/doctest.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ if(NOT TARGET doctest)
2323
doctest
2424
GIT_REPOSITORY https://github.com/doctest/doctest.git
2525
GIT_TAG master
26+
EXCLUDE_FROM_ALL
27+
SYSTEM
2628
)
2729
fetchcontent_makeavailable(doctest)
2830

cmake/dependencies/doxygen.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ if(NOT DOXYGEN_FOUND)
2323
Doxygen
2424
GIT_REPOSITORY https://github.com/doxygen/doxygen.git
2525
GIT_TAG Release_1_9_5
26+
EXCLUDE_FROM_ALL
27+
SYSTEM
2628
)
2729
fetchcontent_makeavailable(Doxygen)
2830

cmake/dependencies/spdlog.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ if(NOT TARGET spdlog::spdlog)
2727
GIT_REPOSITORY https://github.com/gabime/spdlog.git
2828
GIT_TAG v1.11.0
2929
EXCLUDE_FROM_ALL
30+
SYSTEM
3031
)
3132
fetchcontent_makeavailable(spdlog)
3233

cmake/dependencies/toml11.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ if(NOT TARGET toml11)
2323
toml11
2424
GIT_REPOSITORY https://github.com/ToruNiina/toml11.git
2525
GIT_TAG master
26+
EXCLUDE_FROM_ALL
27+
SYSTEM
2628
)
2729
fetchcontent_makeavailable(toml11)
2830

src/KDSpdSetup/setup.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ void setupSink(toml::table &&sinkTable)
4848
auto typeStr = sinkTable.at("type").as_string();
4949

5050
bool ok = false;
51-
for (auto &typeList : { details::fileStrs, details::rotateStrs, details::dailyStrs, details::nullStrs, details::stdStrs, details::linuxStrs, details::winStrs }) {
51+
for (const auto &typeList : { details::fileStrs, details::rotateStrs, details::dailyStrs, details::nullStrs, details::stdStrs, details::linuxStrs, details::winStrs }) {
5252
if (details::inTypelist(typeStr, typeList)) {
5353
ok = true;
5454
break;

0 commit comments

Comments
 (0)