Skip to content

Commit

Permalink
clang-format 18 (#109)
Browse files Browse the repository at this point in the history
  • Loading branch information
graebm authored Jun 12, 2024
1 parent b3fe015 commit a408a08
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 34 deletions.
10 changes: 4 additions & 6 deletions .github/workflows/clang-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,12 @@ on: [push]
jobs:
clang-format:

runs-on: ubuntu-latest
runs-on: ubuntu-24.04 # latest

steps:
- name: Checkout Sources
uses: actions/checkout@v1
uses: actions/checkout@v4

- name: clang-format lint
uses: DoozyX/[email protected]
with:
# List of extensions to check
extensions: c,h
run: |
./format-check.py
47 changes: 47 additions & 0 deletions format-check.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
#!/usr/bin/env python3
import argparse
import os
from pathlib import Path
import re
from subprocess import list2cmdline, run
from tempfile import NamedTemporaryFile

CLANG_FORMAT_VERSION = '18.1.6'

INCLUDE_REGEX = re.compile(
r'^(include|source|tests|verification)/.*\.(c|h|inl)$')
EXCLUDE_REGEX = re.compile(r'^$')

arg_parser = argparse.ArgumentParser(description="Check with clang-format")
arg_parser.add_argument('-i', '--inplace-edit', action='store_true',
help="Edit files inplace")
args = arg_parser.parse_args()

os.chdir(Path(__file__).parent)

# create file containing list of all files to format
filepaths_file = NamedTemporaryFile(delete=False)
for dirpath, dirnames, filenames in os.walk('.'):
for filename in filenames:
# our regexes expect filepath to use forward slash
filepath = Path(dirpath, filename).as_posix()
if not INCLUDE_REGEX.match(filepath):
continue
if EXCLUDE_REGEX.match(filepath):
continue

filepaths_file.write(f"{filepath}\n".encode())
filepaths_file.close()

# use pipx to run clang-format from PyPI
# this is a simple way to run the same clang-format version regardless of OS
cmd = ['pipx', 'run', f'clang-format=={CLANG_FORMAT_VERSION}',
f'--files={filepaths_file.name}']
if args.inplace_edit:
cmd += ['-i']
else:
cmd += ['--Werror', '--dry-run']

print(f"{Path.cwd()}$ {list2cmdline(cmd)}")
if run(cmd).returncode:
exit(1)
24 changes: 0 additions & 24 deletions format-check.sh

This file was deleted.

10 changes: 6 additions & 4 deletions tests/secure_tunnel_tests.c
Original file line number Diff line number Diff line change
Expand Up @@ -621,8 +621,8 @@ int aws_websocket_client_connect_mock_fn(const struct aws_websocket_client_conne
test_fixture->websocket_function_table->on_incoming_frame_complete_fn = options->on_incoming_frame_complete;

void *pointer = test_fixture;
struct aws_websocket_on_connection_setup_data websocket_setup = {.error_code = AWS_ERROR_SUCCESS,
.websocket = pointer};
struct aws_websocket_on_connection_setup_data websocket_setup = {
.error_code = AWS_ERROR_SUCCESS, .websocket = pointer};

(test_fixture->websocket_function_table->on_connection_setup_fn)(&websocket_setup, secure_tunnel);
secure_tunnel->websocket = pointer;
Expand Down Expand Up @@ -1006,8 +1006,10 @@ int aws_websocket_client_connect_fail_once_fn(const struct aws_websocket_client_
test_fixture->websocket_function_table->on_incoming_frame_complete_fn = options->on_incoming_frame_complete;

void *pointer = test_fixture;
struct aws_websocket_on_connection_setup_data websocket_setup = {.error_code = AWS_ERROR_SUCCESS,
.websocket = pointer};
struct aws_websocket_on_connection_setup_data websocket_setup = {
.error_code = AWS_ERROR_SUCCESS,
.websocket = pointer,
};

(test_fixture->websocket_function_table->on_connection_setup_fn)(&websocket_setup, secure_tunnel);

Expand Down

0 comments on commit a408a08

Please sign in to comment.