Skip to content

ci: update clang format version #5661

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

Open
CarolYeh910 wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −7
Open

ci: update clang format version #5661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci_linting.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,9 @@ jobs:
steps:
- uses: actions/checkout@v6
- name: clang-format check
uses: harrisonkaiser/clang-format-action@verbose
uses: jidicula/clang-format-action@v4.16.0
with:
clang-format-version: '15'
clang-format-version: '18'
include-regex: '^(\.\/)?(api|bin|crypto|stuffer|error|tls|utils|tests\/unit|tests\/testlib|docs\/examples).*\.(c|h)$'
nixflake:
# The nix develop changes contain broken nixpkg dependenecies; the allow/impure flags workaround this.
Expand Down
2 changes: 1 addition & 1 deletion crypto/s2n_openssl_evp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@

#include "utils/s2n_safety.h"

DEFINE_POINTER_CLEANUP_FUNC(EVP_PKEY*, EVP_PKEY_free);
DEFINE_POINTER_CLEANUP_FUNC(EVP_PKEY *, EVP_PKEY_free);
7 changes: 4 additions & 3 deletions tls/extensions/s2n_extension_type_lists.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,10 @@ static const s2n_extension_type *const nst_extensions[] = {
&s2n_nst_early_data_indication_extension,
};

#define S2N_EXTENSION_LIST(list) \
{ \
.extension_types = (list), .count = s2n_array_len(list) \
#define S2N_EXTENSION_LIST(list) \
{ \
.extension_types = (list), \
.count = s2n_array_len(list) \
}

static s2n_extension_type_list extension_lists[] = {
Expand Down
2 changes: 1 addition & 1 deletion utils/s2n_compiler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
#define S2N_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)

#define S2N_GCC_VERSION_AT_LEAST(major, minor, patch_level) \
((S2N_GCC_VERSION) >= ((major) *10000 + (minor) *100 + (patch_level)))
((S2N_GCC_VERSION) >= ((major) * 10000 + (minor) * 100 + (patch_level)))
Loading