Skip to content

Commit b2a87f0

Browse files
chore(deps): update dependency https://github.com/serious-scaffold/ss-cpp to v1.6.21
1 parent bdc9a22 commit b2a87f0

20 files changed

+288
-189
lines changed

.copier-answers.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
_commit: v1.6.14
1+
_commit: v1.6.21
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/cd.yml

+11-3
Original file line numberDiff line numberDiff line change
@@ -33,24 +33,32 @@ jobs:
3333
ref: ${{ github.head_ref }}
3434

3535
- name: Cache
36+
<<<<<<< before updating
3637
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
38+
=======
39+
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4
40+
>>>>>>> after updating
3741
with:
3842
path: |
3943
~/vcpkg
4044
~/.cache/pip
4145
~/.cache/vcpkg
42-
key: x64-linux-gcc-13-${{ hashFiles('vcpkg.json') }}
43-
restore-keys: x64-linux-gcc-13-${{ hashFiles('vcpkg.json') }}
46+
key: x64-linux-gcc-14-${{ hashFiles('vcpkg.json') }}
47+
restore-keys: x64-linux-gcc-14-${{ hashFiles('vcpkg.json') }}
4448

4549
- uses: aminya/setup-cpp@v1
4650
with:
47-
compiler: gcc-13
51+
compiler: gcc-14
4852
cmake: true
4953
ninja: true
5054
ccache: true
5155
doxygen: true
5256

57+
<<<<<<< before updating
5358
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
59+
=======
60+
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
61+
>>>>>>> after updating
5462
with:
5563
python-version: 3.x
5664

0 commit comments

Comments
 (0)