Skip to content

Commit 507ead4

Browse files
msclock-bot[bot]msclock
msclock-bot[bot]
and
msclock
authored
chore(deps): update dependency https://github.com/serious-scaffold/ss-cpp to v1.6.14 (#32)
* chore(deps): update dependency https://github.com/serious-scaffold/ss-cpp to v1.6.14 * Resolve conflicts Signed-off-by: l.feng <43399351+msclock@users.noreply.github.com> --------- Signed-off-by: l.feng <43399351+msclock@users.noreply.github.com> Co-authored-by: msclock-bot[bot] <163820484+msclock-bot[bot]@users.noreply.github.com> Co-authored-by: l.feng <43399351+msclock@users.noreply.github.com>
1 parent 415e712 commit 507ead4

File tree

13 files changed

+120
-34
lines changed

13 files changed

+120
-34
lines changed

‎.copier-answers.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
_commit: v1.6.12
1+
_commit: v1.6.14
22
_src_path: https://github.com/serious-scaffold/ss-cpp
33
author_email: msclock@126.com
44
author_name: l.feng

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// https://github.com/devcontainers/images/tree/main/src/base-ubuntu
33
{
44
"name": "cppfront-practice",
5-
"image": "mcr.microsoft.com/devcontainers/base:ubuntu-22.04",
5+
"image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
66
"capAdd": [
77
// Enable ptrace-based debugging for C++
88
"SYS_PTRACE"

‎.github/workflows/cd.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ env:
1919
jobs:
2020
pages:
2121
name: Deploy to GitHub Pages
22-
runs-on: ubuntu-22.04
22+
runs-on: ubuntu-24.04
2323
if: ${{ github.ref_name == github.event.repository.default_branch || (github.event_name == 'release' && github.event.action == 'published') }}
2424
permissions:
2525
contents: write

‎.github/workflows/ci.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ concurrency:
1818

1919
jobs:
2020
pre-commit:
21-
runs-on: ubuntu-22.04
21+
runs-on: ubuntu-24.04
2222
steps:
2323
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
2424
with:
@@ -34,7 +34,7 @@ jobs:
3434

3535

3636
check-on-linux:
37-
runs-on: ubuntu-22.04
37+
runs-on: ubuntu-24.04
3838
needs: [pre-commit]
3939
timeout-minutes: 15
4040
strategy:
@@ -119,7 +119,7 @@ jobs:
119119
strategy:
120120
fail-fast: false
121121
matrix:
122-
triplet: [x64-osx]
122+
triplet: [arm64-osx]
123123
compiler: [gcc@13, llvm@17]
124124
std: [23]
125125
build_type: [Debug, RelWithDebInfo]
@@ -335,7 +335,7 @@ jobs:
335335
run: cmake --build --preset=default --target ccov-all
336336

337337
check-sanitizers:
338-
runs-on: ubuntu-22.04
338+
runs-on: ubuntu-24.04
339339
needs: [pre-commit]
340340
timeout-minutes: 15
341341
strategy:
@@ -385,7 +385,7 @@ jobs:
385385
run: ctest --preset=default
386386

387387
check-valgrind:
388-
runs-on: ubuntu-22.04
388+
runs-on: ubuntu-24.04
389389
needs: [pre-commit]
390390
timeout-minutes: 15
391391
strategy:
@@ -453,7 +453,7 @@ jobs:
453453
path: out/valgrind-results.tar.gz
454454

455455
clang-tidy:
456-
runs-on: ubuntu-22.04
456+
runs-on: ubuntu-24.04
457457
needs: [pre-commit]
458458
timeout-minutes: 15
459459

@@ -502,7 +502,7 @@ jobs:
502502

503503

504504
cppcheck:
505-
runs-on: ubuntu-22.04
505+
runs-on: ubuntu-24.04
506506
needs: [pre-commit]
507507
timeout-minutes: 15
508508

@@ -551,7 +551,7 @@ jobs:
551551

552552

553553
check-docs:
554-
runs-on: ubuntu-22.04
554+
runs-on: ubuntu-24.04
555555
needs: [pre-commit]
556556
timeout-minutes: 15
557557

@@ -597,7 +597,7 @@ jobs:
597597

598598

599599
codecov:
600-
runs-on: ubuntu-22.04
600+
runs-on: ubuntu-24.04
601601
needs: [pre-commit]
602602
timeout-minutes: 15
603603

@@ -667,7 +667,7 @@ jobs:
667667
- clang-tidy
668668
- cppcheck
669669
- codecov
670-
runs-on: ubuntu-22.04
670+
runs-on: ubuntu-24.04
671671
timeout-minutes: 2
672672
permissions:
673673
pull-requests: write
@@ -679,5 +679,5 @@ jobs:
679679
jobs: ${{ toJSON(needs) }}
680680

681681
- name: Approve pr if all jobs succeeded
682-
if: contains(github.event.pull_request.labels.*.name, 'auto-approval')
682+
if: contains(github.event.pull_request.labels.*.name, 'auto-approval') && contains(github.actor, '[bot]')
683683
uses: hmarr/auto-approve-action@v4

‎.github/workflows/codeql.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ permissions:
3030
jobs:
3131
analyze:
3232
name: Analyze
33-
runs-on: ubuntu-22.04
33+
runs-on: ubuntu-24.04
3434
timeout-minutes: 15
3535
permissions:
3636
actions: read

‎.github/workflows/renovate.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ name: Renovate
22

33
on:
44
schedule:
5-
- cron: '*/15 0-3 * * 1'
5+
# Match renovate schedule:earlyMondays and schedule:automergeMonthly
6+
- cron: '*/15 0-3 * * *'
67
workflow_dispatch:
78

89
jobs:
@@ -20,7 +21,7 @@ jobs:
2021
RENOVATE_REPOSITORY_CACHE: enabled
2122
image: ghcr.io/renovatebot/renovate:39.42.4@sha256:c5d718e312cdacc0746e37f13c215ff498be28c51e50efd24c070ae29f5b636a
2223
options: --user root
23-
runs-on: ubuntu-22.04
24+
runs-on: ubuntu-24.04
2425
steps:
2526
- run: env | sort
2627

‎.github/workflows/semantic-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
jobs:
1414
semantic-release:
1515
name: Semantic Release
16-
runs-on: ubuntu-22.04
16+
runs-on: ubuntu-24.04
1717
if: github.event.workflow_run.conclusion == 'success' && github.repository == 'msclock/cppfront-practice'
1818
permissions:
1919
contents: write

‎.renovaterc.json‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,25 @@
1111
"platformAutomerge": true,
1212
"packageRules": [
1313
{
14+
"automerge": true,
15+
"addLabels": [
16+
"auto-approval"
17+
],
18+
"extends": [
19+
"schedule:earlyMondays",
20+
"schedule:automergeMonthly"
21+
],
1422
"matchUpdateTypes": [
1523
"minor",
1624
"patch",
1725
"pin",
1826
"digest"
19-
],
20-
"automerge": true
27+
]
2128
},
2229
{
2330
"description": "Group renovate docker tag and pre-commit-hooks tag",
2431
"groupName": "renovate group",
2532
"addLabels": [
26-
"auto-approval",
2733
"renovate"
2834
],
2935
"matchDatasources": [
@@ -51,12 +57,12 @@
5157
]
5258
},
5359
{
54-
"description": "Update vcpkg.json builtin-baseline with git hash",
60+
"description": "Update microsoft vcpkg baseline",
5561
"customType": "regex",
5662
"currentValueTemplate": "master",
5763
"datasourceTemplate": "git-refs",
5864
"depNameTemplate": "https://github.com/microsoft/vcpkg",
59-
"depTypeTemplate": "vcpkg-builtin-baseline",
65+
"depTypeTemplate": "vcpkg-baseline",
6066
"fileMatch": [
6167
"^vcpkg\\.json$"
6268
],
@@ -65,11 +71,11 @@
6571
]
6672
},
6773
{
68-
"description": "Update registration baseline with git hash",
74+
"description": "Update custom registry baseline",
6975
"customType": "regex",
7076
"currentValueTemplate": "master",
7177
"datasourceTemplate": "git-refs",
72-
"depTypeTemplate": "registration-baseline",
78+
"depTypeTemplate": "vcpkg-baseline",
7379
"fileMatch": [
7480
"^vcpkg\\.json$"
7581
],

‎cmake/ConfigureCoverage.cmake‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ include_guard(GLOBAL)
1414
# cmake-format: off
1515
set(CODE_COVERAGE OFF CACHE BOOL "Enables code coverage.")
1616
set(CODE_COVERAGE_GCOVR_REPORT_FORMAT xml CACHE STRING "Sets the gcovr report format.")
17-
set(CODE_COVERAGE_LCOV_EXTRA_FLAGS "--ignore-errors=gcov" CACHE STRING "Extra flags to pass to lcov")
1817

1918
include(cmake-modules/test/Coverage)
2019

@@ -26,7 +25,7 @@ endif()
2625

2726
# Exclude system directories from code coverage
2827
if(NOT CMAKE_HOST_SYSTEM_NAME MATCHES "Windows")
29-
list(APPEND _excludes "/usr" "/opt")
28+
list(APPEND _excludes "/usr")
3029
endif()
3130

3231
add_code_coverage_all_targets(

‎cmake/ConfigureWarningsAndHardening.cmake‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,48 @@ include(cmake-modules/build/CompilerFlags)
7373
# Hardening
7474
# ##############################################################################
7575

76+
# Comment `-Wl,-z,nodlopen` for dlopen call
77+
if(NOT MSVC)
78+
set(USE_HARDENING_FLAGS
79+
-D_GLIBCXX_ASSERTIONS # Enable assertions
80+
-U_FORTIFY_SOURCE # Disable stack protector
81+
-D_FORTIFY_SOURCE=3 # Enable stack protector
82+
-fstack-protector-strong # Enable stack protector
83+
-fcf-protection # Control Flow Guard
84+
-fstack-clash-protection # Control Flow Guard
85+
-Wimplicit-fallthrough # Enabled in compiler flags by default
86+
-fstrict-flex-arrays=3 # Enable strict array bounds
87+
-Wformat # Enabled in compiler flags by default
88+
-Wformat=2 # Enabled in compiler flags by default
89+
# -Wl,-z,nodlopen # Restrict dlopen(3) calls to shared objects
90+
-Wl,-z,noexecstack # Enable data execution prevention by marking stack
91+
# memory as non-executable
92+
-Wl,-z,relro # Mark relocation table entries resolved at load-time as
93+
# read-only
94+
-Wl,-z,now # Mark relocation table entries resolved at load-time as
95+
# read-only. It impacts startup performance
96+
"-fsanitize=undefined -fsanitize-minimal-runtime" # Enable minimal runtime
97+
# undefined behavior sanitizer
98+
-fno-delete-null-pointer-checks
99+
-fno-strict-overflow
100+
-fno-strict-aliasing
101+
-ftrivial-auto-var-init=zero
102+
-Wtrampolines # Enable trampolines(gcc only)
103+
-mbranch-protection=standard # Enable indirect branches(aarch64 only)
104+
CACHE STRING "Additional hardening compilation flags for GCC/Clang")
105+
106+
set(USE_HARDENING_LINKS
107+
-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
111+
-Wl,-z,noexecstack # Enable data execution prevention by marking stack
112+
# memory as non-executable
113+
-Wl,-z,relro # Mark relocation table entries resolved at load-time as
114+
# read-only
115+
-Wl,-z,now # Mark relocation table entries resolved at load-time as
116+
# read-only. It impacts startup performance
117+
CACHE STRING "Additional hardening linking flags for GCC/Clang")
118+
endif()
119+
76120
include(cmake-modules/build/Hardening)

0 commit comments

Comments
 (0)