Skip to content

Commit bea2c05

Browse files
authored
Update to latest changes from bootstrap (#3)
1 parent 0bfc23e commit bea2c05

25 files changed

+420
-100
lines changed

.clang-format

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,28 @@
1-
# Requires clang version >= 3.8
1+
# Requires clang-format 14 or newer
22
BasedOnStyle: LLVM
3-
Standard: Cpp11
4-
#
3+
Standard: c++17
4+
55
AccessModifierOffset: -4
6-
AlignConsecutiveAssignments: true
7-
AlignEscapedNewlinesLeft: true
8-
AlignOperands: true
6+
AlignConsecutiveAssignments:
7+
Enabled: true
8+
AcrossEmptyLines: false
9+
AcrossComments: false
10+
AlignConsecutiveDeclarations:
11+
Enabled: true
12+
AcrossEmptyLines: false
13+
AcrossComments: false
14+
AlignOperands: Align
915
AlignTrailingComments: true
10-
AlignConsecutiveDeclarations: true
1116
AllowShortFunctionsOnASingleLine: Inline
12-
AlwaysBreakAfterDefinitionReturnType: TopLevel
13-
AlwaysBreakTemplateDeclarations: false
1417
BinPackArguments: false
1518
BreakBeforeBraces: Stroustrup
1619
ColumnLimit: 100
17-
ConstructorInitializerAllOnOneLineOrOnePerLine: true
1820
Cpp11BracedListStyle: true
1921
IndentCaseLabels: false
2022
IndentWidth: 4
2123
KeepEmptyLinesAtTheStartOfBlocks: false
24+
PackConstructorInitializers: NextLine
2225
PointerAlignment: Left
23-
SortIncludes: false
26+
SortIncludes: Never
2427
SpaceAfterCStyleCast: true
2528
# vim: ft=yaml

.cmake-format.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
format:
2+
line_width: 100
3+
tab_size: 4
4+
use_tabchars: false
5+
max_subgroups_hwrap: 3
6+
max_pargs_hwrap: 3
7+
dangle_parens: true

.cmakelintrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
filter=-linelength,-readability/wonkeycase,-syntax

.github/workflows/main.yml

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,34 +11,22 @@ jobs:
1111
runs-on: ubuntu-latest
1212

1313
steps:
14-
- name: Checkout
15-
uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1615

1716
- name: Check formatting
1817
run: make format-check
1918

2019
test:
21-
runs-on: ubuntu-latest
20+
strategy:
21+
matrix:
22+
os: [ubuntu-latest, windows-latest, macos-latest]
23+
runs-on: ${{ matrix.os }}
2224

2325
steps:
24-
- name: Checkout
25-
uses: actions/checkout@v3
26-
27-
- name: Install Ninja, GTest, and GMock
28-
run: |
29-
sudo apt-get update
30-
sudo apt-get install \
31-
google-mock \
32-
googletest \
33-
libgmock-dev \
34-
libgtest-dev \
35-
ninja-build
26+
- uses: actions/checkout@v4
3627

3728
- name: Build
3829
run: make build
3930

40-
- name: Run main
41-
run: make run
42-
4331
- name: Test
4432
run: make test

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
build
2+
cmake-build-*
23
.cache
34
.ccls-cache
45
compile_commands.json

.idea/.gitignore

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/bootstrap-cpp-kata.iml

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/codeStyles/Project.xml

Lines changed: 103 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/codeStyles/codeStyleConfig.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)