Skip to content

Commit

Permalink
Fix formatting to use clang-format 15 rather than 17 (#969)
Browse files Browse the repository at this point in the history
One of the options we were using is not supported on version 15; this PR
drops back to an older version of the same option and updates the CI
script that checks formatting.
  • Loading branch information
Baltoli authored Feb 5, 2024
1 parent 01dd369 commit 29b03b4
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
3 changes: 1 addition & 2 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,5 @@ SpaceBeforeCpp11BracedList: false
DerivePointerAlignment: false
PointerAlignment: Right
ReflowComments: false
QualifierAlignment: Custom
QualifierOrder: ['static', 'constexpr', 'inline', 'friend', 'type', 'const', 'volatile', 'restrict']
QualifierAlignment: Right
...
2 changes: 1 addition & 1 deletion .github/workflows/clang-format-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
uses: jidicula/[email protected]
with:
exclude-regex: '(build|config|deps)'
clang-format-version: 17
clang-format-version: 15

shell-check:
name: Shell check
Expand Down
5 changes: 3 additions & 2 deletions tools/k-rule-apply/auxiliar.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,9 @@ void *printMatchResult(
if (funcPtr == NULL) {
return NULL;
}
auto f = reinterpret_cast<void *(*)(std::ostream &, MatchLog *, size_t,
std::string const &)>(funcPtr);
auto f = reinterpret_cast<
void *(*)(std::ostream &, MatchLog *, size_t, std::string const &)>(
funcPtr);
return f(os, log, logSize, dir);
}

Expand Down

0 comments on commit 29b03b4

Please sign in to comment.