Skip to content

Commit 7f75a92

Browse files
msclock-bot[bot]msclock-bot[bot]
authored
chore(deps): update dependency https://github.com/serious-scaffold/ss-cpp to v1.6.20
1 parent 91ecb87 commit 7f75a92

20 files changed

+220
-185
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.20
22
_src_path: https://github.com/serious-scaffold/ss-cpp
33
author_email: msclock@126.com
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‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,22 @@ jobs:
3939
~/vcpkg
4040
~/.cache/pip
4141
~/.cache/vcpkg
42-
key: x64-linux-gcc-13-${{ hashFiles('vcpkg.json') }}
43-
restore-keys: x64-linux-gcc-13-${{ hashFiles('vcpkg.json') }}
42+
key: x64-linux-gcc-14-${{ hashFiles('vcpkg.json') }}
43+
restore-keys: x64-linux-gcc-14-${{ hashFiles('vcpkg.json') }}
4444

4545
- uses: aminya/setup-cpp@v1
4646
with:
47-
compiler: gcc-13
47+
compiler: gcc-14
4848
cmake: true
4949
ninja: true
5050
ccache: true
5151
doxygen: true
5252

53+
<<<<<<< before updating
5354
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
55+
=======
56+
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
57+
>>>>>>> after updating
5458
with:
5559
python-version: 3.x
5660

‎.github/workflows/ci.yml‎

Lines changed: 69 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@ jobs:
2424
with:
2525
fetch-depth: 0
2626

27+
<<<<<<< before updating
2728
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
29+
=======
30+
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
31+
>>>>>>> after updating
2832
with:
2933
python-version: 3.11
3034

@@ -36,12 +40,11 @@ jobs:
3640
check-on-linux:
3741
runs-on: ubuntu-24.04
3842
needs: [pre-commit]
39-
timeout-minutes: 15
43+
4044
strategy:
41-
fail-fast: false
4245
matrix:
4346
triplet: [x64-linux]
44-
compiler: [gcc-13, llvm-17]
47+
compiler: [gcc-14, llvm-18]
4548
std: [20]
4649
build_type: [Debug, RelWithDebInfo]
4750

@@ -115,13 +118,21 @@ jobs:
115118
if: false
116119
runs-on: macos-14
117120
needs: [pre-commit]
121+
<<<<<<< before updating
118122
timeout-minutes: 30
123+
=======
124+
125+
>>>>>>> after updating
119126
strategy:
120-
fail-fast: false
121127
matrix:
122128
triplet: [arm64-osx]
129+
<<<<<<< before updating
123130
compiler: [gcc@13, llvm@17]
124131
std: [23]
132+
=======
133+
compiler: [gcc@14, llvm@18]
134+
std: [20]
135+
>>>>>>> after updating
125136
build_type: [Debug, RelWithDebInfo]
126137

127138
name: check • ${{ matrix.triplet }} • ${{ matrix.compiler }} • c++${{ matrix.std }} • ${{ matrix.build_type }}
@@ -142,7 +153,11 @@ jobs:
142153

143154
- name: Install compilers and tools
144155
run: |
156+
<<<<<<< before updating
145157
brew install ${{ matrix.compiler }} ninja ccache
158+
=======
159+
brew install ${{ matrix.compiler }} cmake ninja ccache lcov
160+
>>>>>>> after updating
146161

147162
- name: Prepare PATH for compilers
148163
run: echo "PATH=/usr/local/opt/${{ matrix.compiler }}/bin:$PATH" >> $GITHUB_ENV
@@ -162,13 +177,6 @@ jobs:
162177
gcov_version=${compiler##*@}
163178
echo "GCOV=$(which gcov-$gcov_version)" >> $GITHUB_ENV
164179
165-
- name: Prepare for lcov
166-
if: contains(matrix.compiler, 'gcc')
167-
run: |
168-
curl -o /tmp/lcov.rb https://raw.githubusercontent.com/Homebrew/homebrew-core/e92d2ae54954ebf485b484d8522104700b144fee/Formula/lcov.rb
169-
HOMEBREW_NO_AUTO_UPDATE=1 brew install --formula /tmp/lcov.rb
170-
brew pin lcov
171-
172180
- name: Configure CMake
173181
run: >
174182
cmake -S . --preset=default
@@ -201,12 +209,11 @@ jobs:
201209
check-on-windows:
202210
runs-on: windows-2022
203211
needs: [pre-commit]
204-
timeout-minutes: 15
212+
205213
strategy:
206-
fail-fast: false
207214
matrix:
208215
triplet: [x64-windows]
209-
compiler: [msvc-2022, llvm-17]
216+
compiler: [msvc-2022, llvm-18]
210217
std: [20]
211218
build_type: [Debug, RelWithDebInfo]
212219

@@ -267,9 +274,8 @@ jobs:
267274
check-mingw:
268275
runs-on: windows-2022
269276
needs: [pre-commit]
270-
timeout-minutes: 15
277+
271278
strategy:
272-
fail-fast: false
273279
matrix:
274280
triplet: [x64-mingw-dynamic]
275281
compiler: [mingw]
@@ -301,13 +307,17 @@ jobs:
301307
ninja: true
302308
ccache: true
303309

310+
<<<<<<< before updating
304311
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
312+
=======
313+
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
314+
>>>>>>> after updating
305315
with:
306316
python-version: 3.x
307317

308318
- name: Prepare for gcovr
309319
run: |
310-
pip install gcovr==7.2
320+
pip install gcovr==8.3
311321
312322
- name: Configure CMake
313323
run: >
@@ -337,9 +347,8 @@ jobs:
337347
check-sanitizers:
338348
runs-on: ubuntu-24.04
339349
needs: [pre-commit]
340-
timeout-minutes: 15
350+
341351
strategy:
342-
fail-fast: false
343352
matrix:
344353
sanitizer:
345354
- address,undefined
@@ -358,12 +367,12 @@ jobs:
358367
path: |
359368
~/vcpkg
360369
~/.cache/vcpkg
361-
key: x64-linux-gcc-13-${{ hashFiles('vcpkg.json') }}
362-
restore-keys: x64-linux-gcc-13-${{ hashFiles('vcpkg.json') }}
370+
key: x64-linux-gcc-14-${{ hashFiles('vcpkg.json') }}
371+
restore-keys: x64-linux-gcc-14-${{ hashFiles('vcpkg.json') }}
363372

364373
- uses: aminya/setup-cpp@v1
365374
with:
366-
compiler: gcc-13
375+
compiler: gcc-14
367376
cmake: true
368377
ninja: true
369378
ccache: true
@@ -387,9 +396,8 @@ jobs:
387396
check-valgrind:
388397
runs-on: ubuntu-24.04
389398
needs: [pre-commit]
390-
timeout-minutes: 15
399+
391400
strategy:
392-
fail-fast: false
393401
matrix:
394402
build_type: [Debug, RelWithDebInfo]
395403

@@ -406,12 +414,12 @@ jobs:
406414
path: |
407415
~/vcpkg
408416
~/.cache/vcpkg
409-
key: x64-linux-gcc-13-${{ hashFiles('vcpkg.json') }}
410-
restore-keys: x64-linux-gcc-13-${{ hashFiles('vcpkg.json') }}
417+
key: x64-linux-gcc-14-${{ hashFiles('vcpkg.json') }}
418+
restore-keys: x64-linux-gcc-14-${{ hashFiles('vcpkg.json') }}
411419

412420
- uses: aminya/setup-cpp@v1
413421
with:
414-
compiler: gcc-13
422+
compiler: gcc-14
415423
cmake: true
416424
ninja: true
417425
ccache: true
@@ -455,7 +463,6 @@ jobs:
455463
clang-tidy:
456464
runs-on: ubuntu-24.04
457465
needs: [pre-commit]
458-
timeout-minutes: 15
459466

460467
steps:
461468
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -468,17 +475,21 @@ jobs:
468475
path: |
469476
~/vcpkg
470477
~/.cache/vcpkg
471-
key: x64-linux-gcc-13-${{ hashFiles('vcpkg.json') }}
472-
restore-keys: x64-linux-gcc-13-${{ hashFiles('vcpkg.json') }}
478+
key: x64-linux-gcc-14-${{ hashFiles('vcpkg.json') }}
479+
restore-keys: x64-linux-gcc-14-${{ hashFiles('vcpkg.json') }}
473480

474481
- uses: aminya/setup-cpp@v1
475482
with:
476-
compiler: gcc-13
483+
compiler: gcc-14
477484
cmake: true
478485
ninja: true
479486
ccache: true
480487

488+
<<<<<<< before updating
481489
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
490+
=======
491+
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
492+
>>>>>>> after updating
482493
with:
483494
python-version: 3.x
484495

@@ -504,7 +515,6 @@ jobs:
504515
cppcheck:
505516
runs-on: ubuntu-24.04
506517
needs: [pre-commit]
507-
timeout-minutes: 15
508518

509519
steps:
510520
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -517,23 +527,31 @@ jobs:
517527
path: |
518528
~/vcpkg
519529
~/.cache/vcpkg
520-
key: x64-linux-gcc-13-${{ hashFiles('vcpkg.json') }}
521-
restore-keys: x64-linux-gcc-13-${{ hashFiles('vcpkg.json') }}
530+
key: x64-linux-gcc-14-${{ hashFiles('vcpkg.json') }}
531+
restore-keys: x64-linux-gcc-14-${{ hashFiles('vcpkg.json') }}
522532

523533
- uses: aminya/setup-cpp@v1
524534
with:
525-
compiler: gcc-13
535+
compiler: gcc-14
526536
cmake: true
527537
ninja: true
528538
ccache: true
529539

540+
<<<<<<< before updating
530541
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
542+
=======
543+
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
544+
>>>>>>> after updating
531545
with:
532546
python-version: 3.x
533547

534548
- name: Install latest cppcheck
535549
run: |
550+
<<<<<<< before updating
536551
pip install cppcheck==1.4.6
552+
=======
553+
pip install cppcheck==1.4.7
554+
>>>>>>> after updating
537555

538556
- name: Configure CMake
539557
run: >
@@ -553,7 +571,6 @@ jobs:
553571
check-docs:
554572
runs-on: ubuntu-24.04
555573
needs: [pre-commit]
556-
timeout-minutes: 15
557574

558575
steps:
559576
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -567,19 +584,23 @@ jobs:
567584
~/vcpkg
568585
~/.cache/pip
569586
~/.cache/vcpkg
570-
key: x64-linux-gcc-13-${{ hashFiles('vcpkg.json') }}
571-
restore-keys: x64-linux-gcc-13-${{ hashFiles('vcpkg.json') }}
587+
key: x64-linux-gcc-14-${{ hashFiles('vcpkg.json') }}
588+
restore-keys: x64-linux-gcc-14-${{ hashFiles('vcpkg.json') }}
572589

573590
- uses: aminya/setup-cpp@v1
574591
with:
575-
compiler: gcc-13
592+
compiler: gcc-14
576593
cmake: true
577594
ninja: true
578595
ccache: true
579596
doxygen: true
580597
graphviz: true
581598

599+
<<<<<<< before updating
582600
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
601+
=======
602+
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
603+
>>>>>>> after updating
583604
with:
584605
python-version: 3.x
585606

@@ -599,7 +620,6 @@ jobs:
599620
codecov:
600621
runs-on: ubuntu-24.04
601622
needs: [pre-commit]
602-
timeout-minutes: 15
603623

604624
steps:
605625
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -612,20 +632,20 @@ jobs:
612632
path: |
613633
~/vcpkg
614634
~/.cache/vcpkg
615-
key: x64-linux-gcc-13-${{ hashFiles('vcpkg.json') }}
616-
restore-keys: x64-linux-gcc-13-${{ hashFiles('vcpkg.json') }}
635+
key: x64-linux-gcc-14-${{ hashFiles('vcpkg.json') }}
636+
restore-keys: x64-linux-gcc-14-${{ hashFiles('vcpkg.json') }}
617637

618638
- uses: aminya/setup-cpp@v1
619639
with:
620-
compiler: gcc-13
640+
compiler: gcc-14
621641
cmake: true
622642
ninja: true
623643
ccache: true
624644

625645
- name: Prepare for lcov
626646
run: |
627647
sudo apt-get update; sudo apt-get install lcov -y
628-
gcc_compiler=gcc-13
648+
gcc_compiler=gcc-14
629649
gcov_version=${gcc_compiler##*-}
630650
sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-$gcov_version 100
631651
@@ -646,12 +666,16 @@ jobs:
646666
run: cmake --build --preset=default --target ccov-all
647667

648668
- name: Upload coverage report
669+
<<<<<<< before updating
649670
uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
671+
=======
672+
uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
673+
>>>>>>> after updating
650674
with:
651675
token: ${{ secrets.CODECOV_TOKEN }}
652676
fail_ci_if_error: true
653677
disable_search: true
654-
file: ./out/build/default/code_coverage/coverage.info
678+
files: ./out/build/default/code_coverage/coverage.info
655679
verbose: true
656680

657681

‎.github/workflows/codeql.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ jobs:
6161
path: |
6262
~/vcpkg
6363
~/.cache/vcpkg
64-
key: x64-linux-gcc-13-${{ hashFiles('vcpkg.json') }}
65-
restore-keys: x64-linux-gcc-13-${{ hashFiles('vcpkg.json') }}
64+
key: x64-linux-gcc-14-${{ hashFiles('vcpkg.json') }}
65+
restore-keys: x64-linux-gcc-14-${{ hashFiles('vcpkg.json') }}
6666

6767
- uses: aminya/setup-cpp@v1
6868
with:
69-
compiler: gcc-13
69+
compiler: gcc-14
7070
cmake: true
7171
ninja: true
7272
ccache: true

0 commit comments

Comments
 (0)