Skip to content

Commit 4284171

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

File tree

7 files changed

+33
-16
lines changed

7 files changed

+33
-16
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.16
22
_src_path: https://github.com/serious-scaffold/ss-cpp
33
author_email: [email protected]
44
author_name: l.feng

.github/workflows/ci.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -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: >
@@ -646,12 +646,16 @@ jobs:
646646
run: cmake --build --preset=default --target ccov-all
647647

648648
- name: Upload coverage report
649+
<<<<<<< before updating
649650
uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
651+
=======
652+
uses: codecov/codecov-action@7f8b4b4bde536c465e797be725718b88c5d95e0e # v5.1.1
653+
>>>>>>> after updating
650654
with:
651655
token: ${{ secrets.CODECOV_TOKEN }}
652656
fail_ci_if_error: true
653657
disable_search: true
654-
file: ./out/build/default/code_coverage/coverage.info
658+
files: ./out/build/default/code_coverage/coverage.info
655659
verbose: true
656660

657661

.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)