Skip to content

Commit 5ca8438

Browse files
authored
Merge pull request #86 from elbeno/update-fixes
⬆️ Fix clang-format issues
2 parents a301b63 + a3ff52d commit 5ca8438

File tree

3 files changed

+57
-23
lines changed

3 files changed

+57
-23
lines changed

.clang-format

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
BasedOnStyle: LLVM
2+
IndentWidth: 4
3+
4+
IncludeBlocks: Regroup
5+
IncludeCategories:
6+
- Regex: '^".*'
7+
Priority: 1
8+
- Regex: '^<safe/.*'
9+
Priority: 2
10+
- Regex: '^<(cib|flow|interrupt|log|log_binary|log_fmt|lookup|match|msg|nexus|seq)/.*'
11+
Priority: 3
12+
- Regex: '^<groov/.*'
13+
Priority: 4
14+
- Regex: '^<async/.*'
15+
Priority: 6
16+
- Regex: '^<stdx/.*'
17+
Priority: 7
18+
- Regex: '^<conc/.*'
19+
Priority: 8
20+
- Regex: '^<(boost|catch2|fmt|fuzztest|gmock|gtest|rapidcheck|snitch)/.*'
21+
Priority: 9
22+
- Regex: '^<GUnit.h>'
23+
Priority: 9
24+
- Regex: '<([a-z_])+>'
25+
Priority: 10
26+
27+
QualifierAlignment: Custom
28+
QualifierOrder: ['friend', 'constexpr', 'static', 'inline', 'type', 'const', 'volatile']

.github/workflows/asciidoctor-ghpages.yml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,14 @@ jobs:
3636
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
3737

3838
- name: Setup Node.js
39-
uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
39+
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
4040
with:
41-
node-version: 20
41+
node-version: 22
4242

43-
- name: Install Mermaid
43+
- name: Install Asciidoctor & Mermaid
4444
run: |
45-
npm install -g @mermaid-js/mermaid-cli@11.4.2
45+
npm install -g @mermaid-js/mermaid-cli@11.12.0
4646
npx puppeteer browsers install chrome-headless-shell
47-
48-
- name: Install asciidoctor
49-
run: |
50-
sudo apt update
51-
sudo apt install -y asciidoctor
5247
sudo gem install asciidoctor asciidoctor-diagram rouge
5348
5449
- name: Restore CPM cache

.gitignore

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,26 @@
1-
/build
2-
/cmake-build-*
3-
/venv
4-
/.vscode
5-
/.idea
6-
/.cache
7-
/.DS_Store
8-
.clang-format
9-
.clang-tidy
10-
.cmake-format.yaml
11-
CMakePresets.json
1+
# ignore all directories that start with . (except .github/)
2+
**/.*/
3+
!.github/
4+
5+
# ignore conventionally-named build directories
6+
**/build*/
7+
**/*build/
8+
# and some other build directories
9+
**/cmake-build-*/
10+
11+
# ignore conventionally-named Python virtual env directories
12+
# (this is only necessary before Python 3.13)
13+
**/venv*/
14+
**/*venv/
15+
# and __pycache__ directories
16+
**/__pycache__/
17+
18+
# ignore files provided by CICD
19+
/.clang-tidy
20+
/.cmake-format.yaml
21+
/CMakePresets.json
1222
/toolchains
13-
mull.yml
14-
requirements.txt
15-
docs/puppeteer_config.json
23+
/mull.yml
24+
/requirements.txt
25+
/docs/puppeteer_config.json
26+
/docs/mermaid.conf

0 commit comments

Comments
 (0)