Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Apply pre-commit formatters #127

Merged
merged 8 commits into from
May 4, 2021
Merged

Apply pre-commit formatters #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6458e93
Apply pre-commit formatters
joaander May 3, 2021
791bef2
Use newer C++ standard in clang-format
joaander May 4, 2021
5256e17
Move render implementation into separate function
joaander May 4, 2021
92e6642
Apply clang-format 11 styling
joaander May 4, 2021
bae8f49
Only run clang-format on GitHub Actions
joaander May 4, 2021
238c4b4
Test pre-commit.ci
joaander May 4, 2021
53ccbcf
Skip clang-format in pre-commit.ci
joaander May 4, 2021
5164761
Apply pre-commit
joaander May 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ AccessModifierOffset: 0
AlignAfterOpenBracket: Align
AlignEscapedNewlines: 'Left'
AlignOperands: 'true'
AlignTrailingComments: 'true'
AlignTrailingComments: 'false'
AllowAllArgumentsOnNextLine: 'false'
AllowAllParametersOfDeclarationOnNextLine: 'false'
AllowShortFunctionsOnASingleLine: Empty
Expand All @@ -29,7 +29,7 @@ SpaceAfterTemplateKeyword: 'false'
SpaceBeforeParens: ControlStatements
SpacesInAngles: 'false'
SpaceInEmptyParentheses: false
Standard: Cpp11
Standard: c++14
TabWidth: '4'
UseTab: Never

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/make-changelog-md.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@ pcregrep -M "^${tag}.*\n\^\^\^\^+.*\n(.*\n)+?(\^\^\^\^+|^---+)$" CHANGELOG.rst \
| tail -n +3 \
| head -n -2 \
| pandoc --from=rst --to=markdown

2 changes: 1 addition & 1 deletion .github/workflows/style_check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- uses: actions/setup-python@v2.2.2
- uses: pre-commit/action@v2.0.2
with:
extra_args: --all-files --hook-stage manual
extra_args: --all-files --hook-stage manual clang-format

# This job is used to provide a single requirement for branch merge conditions.
checks_complete:
Expand Down
3 changes: 3 additions & 0 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
ci:
skip: [clang-format]

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: 'v3.4.0'
Expand Down
1 change: 0 additions & 1 deletion ContributorAgreement.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,3 @@ you are authorized to sign this contract on behalf of your company (if identifie
Based on the Sun Contributor Agreement - version 1.5.
This document is licensed under a Creative Commons Attribution-Share Alike 3.0 Unported License
http://creativecommons.org/licenses/by-sa/3.0/