Skip to content

Commit 84b0003

Browse files
chore(deps): update dependency https://github.com/serious-scaffold/ss-cpp to v1.6.17
1 parent 485f360 commit 84b0003

File tree

7 files changed

+42
-31
lines changed

7 files changed

+42
-31
lines changed

.copier-answers.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
_commit: v1.6.14
1+
_commit: v1.6.17
22
_src_path: https://github.com/serious-scaffold/ss-cpp
33
author_email: [email protected]
44
author_name: l.feng

.github/workflows/ci.yml

+15-17
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
@@ -553,7 +549,6 @@ jobs:
553549
check-docs:
554550
runs-on: ubuntu-24.04
555551
needs: [pre-commit]
556-
timeout-minutes: 15
557552

558553
steps:
559554
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -599,7 +594,6 @@ jobs:
599594
codecov:
600595
runs-on: ubuntu-24.04
601596
needs: [pre-commit]
602-
timeout-minutes: 15
603597

604598
steps:
605599
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -646,12 +640,16 @@ jobs:
646640
run: cmake --build --preset=default --target ccov-all
647641

648642
- name: Upload coverage report
643+
<<<<<<< before updating
649644
uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
645+
=======
646+
uses: codecov/codecov-action@7f8b4b4bde536c465e797be725718b88c5d95e0e # v5.1.1
647+
>>>>>>> after updating
650648
with:
651649
token: ${{ secrets.CODECOV_TOKEN }}
652650
fail_ci_if_error: true
653651
disable_search: true
654-
file: ./out/build/default/code_coverage/coverage.info
652+
files: ./out/build/default/code_coverage/coverage.info
655653
verbose: true
656654

657655

.github/workflows/renovate.yml

+1-1
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.57.4@sha256:a1f28f4eba3589d4cf7228f82ba1bdcec42947407f9379d719c0f8a581c564f9
2323
options: --user root
2424
runs-on: ubuntu-24.04
2525
steps:

.pre-commit-config.yaml

+5-1
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.5
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.59.0
102+
>>>>>>> after updating
99103
hooks:
100104
- id: renovate-config-validator
101105
stages: [manual]

.vscode/launch.json

+15-1
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

+2-7
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",

vcpkg.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
33
"name": "cppfront-practice",
44
"description": "Practice based on cppfront",
5-
"builtin-baseline": "55dec59d05cd1731a06a832302e80f6105a3d482",
5+
"builtin-baseline": "20a72ce99b12dd0ebfea5d39f32681bd68b19d03",
66
"homepage": "https://github.com/msclock/cppfront-practice",
77
"dependencies": [
88
"cppfront",
@@ -23,7 +23,7 @@
2323
},
2424
{
2525
"name": "cmake-modules",
26-
"version": "1.6.8"
26+
"version": "1.6.11"
2727
},
2828
{
2929
"name": "robotology-cmake-ycm",
@@ -45,7 +45,7 @@
4545
"registries": [
4646
{
4747
"kind": "git",
48-
"baseline": "9d739d71af31a73a6000fb1e64b7cca54a962439",
48+
"baseline": "09ae1472980f5e2132654900bb48061444b1cea5",
4949
"repository": "https://github.com/msclock/cmake-registry",
5050
"packages": [
5151
"cmake-modules",

0 commit comments

Comments
 (0)