Skip to content

Commit 26bebbc

Browse files
chore(deps): update dependency https://github.com/serious-scaffold/ss-cpp to v1.6.19
1 parent 925151e commit 26bebbc

17 files changed

+145
-153
lines changed

.copier-answers.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
_commit: v1.6.14
1+
_commit: v1.6.19
22
_src_path: https://github.com/serious-scaffold/ss-cpp
33
author_email: [email protected]
44
author_name: l.feng
@@ -15,6 +15,7 @@ header_target: ''
1515
organization_name: msclock
1616
project_description: Practice based on cppfront
1717
project_name: Practice on cppfront
18+
repo_host: github.com
1819
repo_name: cppfront-practice
1920
repo_namespace: msclock
2021
repo_platform: github

.github/workflows/ci.yml

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@ jobs:
3636
check-on-linux:
3737
runs-on: ubuntu-24.04
3838
needs: [pre-commit]
39-
timeout-minutes: 15
39+
4040
strategy:
41-
fail-fast: false
4241
matrix:
4342
triplet: [x64-linux]
4443
compiler: [gcc-13, llvm-17]
@@ -115,9 +114,12 @@ jobs:
115114
if: false
116115
runs-on: macos-14
117116
needs: [pre-commit]
117+
<<<<<<< before updating
118118
timeout-minutes: 30
119+
=======
120+
121+
>>>>>>> after updating
119122
strategy:
120-
fail-fast: false
121123
matrix:
122124
triplet: [arm64-osx]
123125
compiler: [gcc@13, llvm@17]
@@ -201,9 +203,8 @@ jobs:
201203
check-on-windows:
202204
runs-on: windows-2022
203205
needs: [pre-commit]
204-
timeout-minutes: 15
206+
205207
strategy:
206-
fail-fast: false
207208
matrix:
208209
triplet: [x64-windows]
209210
compiler: [msvc-2022, llvm-17]
@@ -267,9 +268,8 @@ jobs:
267268
check-mingw:
268269
runs-on: windows-2022
269270
needs: [pre-commit]
270-
timeout-minutes: 15
271+
271272
strategy:
272-
fail-fast: false
273273
matrix:
274274
triplet: [x64-mingw-dynamic]
275275
compiler: [mingw]
@@ -307,7 +307,7 @@ jobs:
307307

308308
- name: Prepare for gcovr
309309
run: |
310-
pip install gcovr==7.2
310+
pip install gcovr==8.2
311311
312312
- name: Configure CMake
313313
run: >
@@ -337,9 +337,8 @@ jobs:
337337
check-sanitizers:
338338
runs-on: ubuntu-24.04
339339
needs: [pre-commit]
340-
timeout-minutes: 15
340+
341341
strategy:
342-
fail-fast: false
343342
matrix:
344343
sanitizer:
345344
- address,undefined
@@ -387,9 +386,8 @@ jobs:
387386
check-valgrind:
388387
runs-on: ubuntu-24.04
389388
needs: [pre-commit]
390-
timeout-minutes: 15
389+
391390
strategy:
392-
fail-fast: false
393391
matrix:
394392
build_type: [Debug, RelWithDebInfo]
395393

@@ -455,7 +453,6 @@ jobs:
455453
clang-tidy:
456454
runs-on: ubuntu-24.04
457455
needs: [pre-commit]
458-
timeout-minutes: 15
459456

460457
steps:
461458
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -504,7 +501,6 @@ jobs:
504501
cppcheck:
505502
runs-on: ubuntu-24.04
506503
needs: [pre-commit]
507-
timeout-minutes: 15
508504

509505
steps:
510506
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -533,7 +529,11 @@ jobs:
533529

534530
- name: Install latest cppcheck
535531
run: |
532+
<<<<<<< before updating
536533
pip install cppcheck==1.4.6
534+
=======
535+
pip install cppcheck==1.4.7
536+
>>>>>>> after updating
537537

538538
- name: Configure CMake
539539
run: >
@@ -553,7 +553,6 @@ jobs:
553553
check-docs:
554554
runs-on: ubuntu-24.04
555555
needs: [pre-commit]
556-
timeout-minutes: 15
557556

558557
steps:
559558
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -599,7 +598,6 @@ jobs:
599598
codecov:
600599
runs-on: ubuntu-24.04
601600
needs: [pre-commit]
602-
timeout-minutes: 15
603601

604602
steps:
605603
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -646,12 +644,16 @@ jobs:
646644
run: cmake --build --preset=default --target ccov-all
647645

648646
- name: Upload coverage report
647+
<<<<<<< before updating
649648
uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
649+
=======
650+
uses: codecov/codecov-action@1e68e06f1dbfde0e4cefc87efeba9e4643565303 # v5.1.2
651+
>>>>>>> after updating
650652
with:
651653
token: ${{ secrets.CODECOV_TOKEN }}
652654
fail_ci_if_error: true
653655
disable_search: true
654-
file: ./out/build/default/code_coverage/coverage.info
656+
files: ./out/build/default/code_coverage/coverage.info
655657
verbose: true
656658

657659

.github/workflows/renovate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
RENOVATE_PLATFORM: github
2020
RENOVATE_REPOSITORIES: '["${{ github.repository }}"]'
2121
RENOVATE_REPOSITORY_CACHE: enabled
22-
image: ghcr.io/renovatebot/renovate:39.42.4@sha256:c5d718e312cdacc0746e37f13c215ff498be28c51e50efd24c070ae29f5b636a
22+
image: ghcr.io/renovatebot/renovate:39.91.3@sha256:fe6475e56915dbcd948cf7b94b879d38d2c261fbe7e2b869d35556229a5fce9c
2323
options: --user root
2424
runs-on: ubuntu-24.04
2525
steps:

.pre-commit-config.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ repos:
8282

8383
# Clang format the codebase automatically
8484
- repo: https://github.com/pre-commit/mirrors-clang-format
85-
rev: v19.1.4
85+
rev: v19.1.6
8686
hooks:
8787
- id: clang-format
8888
types_or: [c++, c, cuda]
@@ -95,7 +95,11 @@ repos:
9595

9696
# Check for renovate config
9797
- repo: https://github.com/renovatebot/pre-commit-hooks
98+
<<<<<<< before updating
9899
rev: 39.57.4
100+
=======
101+
rev: 39.91.3
102+
>>>>>>> after updating
99103
hooks:
100104
- id: renovate-config-validator
101105
stages: [manual]

.renovaterc.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@
1616
"auto-approval"
1717
],
1818
"extends": [
19-
"schedule:earlyMondays",
20-
"schedule:automergeMonthly"
19+
"schedule:earlyMondays"
20+
],
21+
"automergeSchedule": [
22+
"* 0-3 1-7 * *"
2123
],
2224
"matchUpdateTypes": [
2325
"minor",

.vscode/launch.json

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,27 @@
55
"version": "0.2.0",
66
"configurations": [
77
{
8+
<<<<<<< before updating
9+
=======
10+
"name": "(Windows) Launch",
11+
"type": "cppvsdbg",
12+
"request": "launch",
13+
"program": "${command:cmake.launchTargetPath}",
14+
"args": [],
15+
"stopAtEntry": false,
16+
"cwd": "${command:cmake.launchTargetDirectory}",
17+
"environment": [],
18+
"console": "integratedTerminal"
19+
},
20+
{
21+
>>>>>>> after updating
822
"name": "(gdb) Launch",
923
"type": "cppdbg",
1024
"request": "launch",
1125
"program": "${command:cmake.launchTargetPath}",
1226
"args": [],
1327
"stopAtEntry": false,
14-
"cwd": "${fileDirname}",
28+
"cwd": "${command:cmake.launchTargetDirectory}",
1529
"environment": [],
1630
"externalConsole": false,
1731
"MIMode": "gdb",

.vscode/settings.json

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
{
2+
"cmake.configureOnEdit": false,
3+
"cmake.options.statusBarVisibility": "icon",
24
"cmake.useCMakePresets": "always",
3-
"cmake.options.statusBarVisibility": "compact",
4-
"files.exclude": {
5-
"**/.clangd/**": true
6-
},
7-
"files.watcherExclude": {
8-
"**/.clangd/**": true
9-
},
105
"files.associations": {
116
"*.cpp2": "cpp",
127
"*.h2": "cpp",

CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ message(STATUS "CMAKE VERSION:${CMAKE_VERSION}")
55
project(
66
cppfront-practice
77
LANGUAGES CXX C
8-
HOMEPAGE_URL "https://github.com/msclock/cppfront-practice"
8+
HOMEPAGE_URL "https:///msclock/cppfront-practice"
99
DESCRIPTION "Practice based on cppfront")
1010

11+
<<<<<<< before updating
1112
set(CMAKE_CXX_STANDARD
1213
23
1314
CACHE STRING "C++ standard")
@@ -22,14 +23,13 @@ set(CMAKE_CXX_EXTENSIONS
2223
include_directories(${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include)
2324

2425
# From https://github.com/msclock/cmake-registry.
26+
=======
27+
# Project default module
28+
>>>>>>> after updating
2529
find_package(cmake-modules REQUIRED)
2630
include(cmake-modules/ProjectDefault)
27-
28-
# Project custom modules
29-
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
30-
include(ConfigureWarningsAndHardening)
3131
include(ConfigureVersion)
32-
include(ConfigureDocs)
3332
include(ConfigureCoverage)
33+
include(ConfigureDocs)
3434

3535
add_subdirectory(src)

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@ clean:
2626
# Install standalone tools
2727
prerequisites:
2828
pipx install --force pre-commit==4.0.1
29+
<<<<<<< before updating
2930
pipx install --force watchfiles==1.0.0
31+
=======
32+
pipx install --force watchfiles==1.0.3
33+
>>>>>>> after updating
3034

3135
########################################################################################
3236
# Lint

cmake/ConfigureWarningsAndHardening.cmake renamed to cmake/ProjectOptions.cmake

Lines changed: 17 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
#[[
2-
This file configures the following things:
3-
- dynamic tools: sanitizers, valgrind.
4-
- static tools: clang-tidy, cppcheck.
5-
- compiler flags
6-
- hardening options
7-
2+
ProjectOptions.cmake - Defines project-specific options for CMake.
83
]]
94

10-
include_guard(GLOBAL)
5+
set(CMAKE_CXX_STANDARD
6+
20
7+
CACHE STRING "C++ standard")
8+
set(CMAKE_CXX_STANDARD_REQUIRED
9+
ON
10+
CACHE BOOL "C++ standard required")
11+
set(CMAKE_CXX_EXTENSIONS
12+
OFF
13+
CACHE BOOL "C++ extensions")
1114

1215
# ##############################################################################
13-
# Sanitizer
16+
# Sanitizer - cmake-modules/build/Sanitizer.cmake
1417
# ##############################################################################
1518

1619
set(USE_SANITIZER
1720
OFF
1821
CACHE BOOL "Enable sanitizer")
1922

20-
include(cmake-modules/build/Sanitizer)
21-
2223
# ##############################################################################
23-
# Valgrind
24+
# Valgrind - cmake-modules/test/Valgrind.cmake
2425
# ##############################################################################
2526

2627
set(USE_VALGRIND
@@ -37,20 +38,16 @@ set(USE_VALGRIND_OPTIONS
3738
# Valgrind is unacceptably slow.
3839
CACHE STRING "valgrind options.")
3940

40-
include(cmake-modules/test/Valgrind)
41-
4241
# ##############################################################################
43-
# Clang-Tidy
42+
# Clang-Tidy - cmake-modules/build/ClangTidy.cmake
4443
# ##############################################################################
4544

4645
set(USE_CLANGTIDY
4746
OFF
4847
CACHE BOOL "Enable Clang-Tidy")
4948

50-
include(cmake-modules/build/ClangTidy)
51-
5249
# ##############################################################################
53-
# Cppcheck
50+
# Cppcheck - cmake-modules/build/Cppcheck.cmake
5451
# ##############################################################################
5552

5653
set(USE_CPPCHECK
@@ -61,16 +58,8 @@ set(USE_CPPCHECK_SUPPRESSION_FILE
6158
CACHE STRING
6259
"Customize the path to the Cppcheck suppressions file of the project")
6360

64-
include(cmake-modules/build/Cppcheck)
65-
6661
# ##############################################################################
67-
# CompilerFlags
68-
# ##############################################################################
69-
70-
include(cmake-modules/build/CompilerFlags)
71-
72-
# ##############################################################################
73-
# Hardening
62+
# Hardening - cmake-modules/build/Hardening.cmake
7463
# ##############################################################################
7564

7665
# Comment `-Wl,-z,nodlopen` for dlopen call
@@ -105,9 +94,8 @@ if(NOT MSVC)
10594

10695
set(USE_HARDENING_LINKS
10796
-fstack-protector-strong # Enable stack protector
108-
"-fsanitize=undefined -fsanitize-minimal-runtime" # Enable minimal runtime
109-
# undefined behavior sanitizer -Wl,-z,nodlopen # Restrict dlopen(3) calls
110-
# to shared objects
97+
"-fsanitize=undefined -fsanitize-minimal-runtime"
98+
# -Wl,-z,nodlopen # Restrict dlopen(3) calls to shared objects
11199
-Wl,-z,noexecstack # Enable data execution prevention by marking stack
112100
# memory as non-executable
113101
-Wl,-z,relro # Mark relocation table entries resolved at load-time as
@@ -116,5 +104,3 @@ if(NOT MSVC)
116104
# read-only. It impacts startup performance
117105
CACHE STRING "Additional hardening linking flags for GCC/Clang")
118106
endif()
119-
120-
include(cmake-modules/build/Hardening)

0 commit comments

Comments
 (0)