Skip to content

Commit 77f5890

Browse files
authored
Run workflow on pull requests & bump version (#33)
* Run workflow on pull requests & bump version * Workflow should confirm formatting * Apply code formatting
1 parent 0eb411c commit 77f5890

5 files changed

Lines changed: 20 additions & 13 deletions

File tree

.github/workflows/build_and_test.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
name: Build and Test
22

3-
on: [push]
3+
on: [push, pull_request]
44

55
jobs:
66
build:
77
runs-on: ubuntu-latest
88

99
steps:
10-
- uses: actions/checkout@v2
10+
- uses: actions/checkout@v6
1111
- name: Build & Test
1212
run: make test
1313
- name: Fuzz
@@ -20,4 +20,6 @@ jobs:
2020
- name: Test no history
2121
run: |
2222
make clean
23-
make CFLAGS="-DEMBEDDED_CLI_HISTORY_LEN=0 -I." test
23+
make CFLAGS="-DEMBEDDED_CLI_HISTORY_LEN=0 -I." test
24+
- name: Check code format
25+
run: make format-check

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,11 @@ embedded_cli_fuzzer: embedded_cli.c tests/embedded_cli_fuzzer.c
2828
format:
2929
$(CLANG_FORMAT) -i $(SOURCES)
3030

31+
format-check:
32+
$(CLANG_FORMAT) --Werror --dry-run $(SOURCES)
33+
3134
clean:
3235
rm -f *.o */*.o embedded_cli_test embedded_cli_fuzzer examples/posix_demo
3336
rm -f timeout-* crash-*
3437

35-
.PHONY: clean format test default fuzz
38+
.PHONY: clean format test default fuzz format-check

embedded_cli.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ void embedded_cli_init(struct embedded_cli *cli, const char *prompt,
6060

6161
static void cli_ansi(struct embedded_cli *cli, size_t n, char code)
6262
{
63-
char buffer[5] = {'\x1b', '[', (char) ('0' + (n % 10)), code, '\0'};
63+
char buffer[5] = {'\x1b', '[', (char)('0' + (n % 10)), code, '\0'};
6464
cli_puts(cli, buffer);
6565
}
6666

@@ -143,7 +143,7 @@ const char *embedded_cli_get_history(struct embedded_cli *cli,
143143

144144
// Search back through the history buffer for `history_pos` entry
145145
for (int i = 0; i < history_pos; i++) {
146-
int len = (int) strlen(&cli->history[pos]);
146+
int len = (int)strlen(&cli->history[pos]);
147147
if (len == 0)
148148
return NULL;
149149
pos += len + 1;
@@ -205,7 +205,7 @@ bool embedded_cli_insert_char(struct embedded_cli *cli, char ch)
205205
// printf("Inserting char %d 0x%x '%c'\n", ch, ch, ch);
206206
if (cli->have_csi) {
207207
if (ch >= '0' && ch <= '9' && cli->counter < 100) {
208-
cli->counter = (cli->counter * 10) + (size_t) (ch - '0');
208+
cli->counter = (cli->counter * 10) + (size_t)(ch - '0');
209209
// printf("cli->counter -> %d\n", cli->counter);
210210
} else {
211211
if (cli->counter == 0)
@@ -374,7 +374,8 @@ bool embedded_cli_insert_char(struct embedded_cli *cli, char ch)
374374
break;
375375
case '\x15': // Ctrl-U
376376
// move back data after cursor, including last \0
377-
memmove(cli->buffer, cli->buffer + cli->cursor, cli->len - cli->cursor + 1);
377+
memmove(cli->buffer, cli->buffer + cli->cursor,
378+
cli->len - cli->cursor + 1);
378379
cli->len = cli->len - cli->cursor;
379380
// clear from beggining of buffer,
380381
// print buffer again and move back to start

examples/posix_demo.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ static char getch(void)
3030

3131
// Do what cfmakeraw does (Using --std=c99 means that cfmakeraw isn't
3232
// available)
33-
raw.c_iflag &=
34-
(tcflag_t)~(IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR | IGNCR | ICRNL | IXON);
33+
raw.c_iflag &= (tcflag_t) ~(IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR |
34+
IGNCR | ICRNL | IXON);
3535
raw.c_oflag &= (tcflag_t)~OPOST;
36-
raw.c_lflag &= (tcflag_t)~(ECHO | ECHONL | ICANON | ISIG | IEXTEN);
37-
raw.c_cflag &= (tcflag_t)~(CSIZE | PARENB);
36+
raw.c_lflag &= (tcflag_t) ~(ECHO | ECHONL | ICANON | ISIG | IEXTEN);
37+
raw.c_cflag &= (tcflag_t) ~(CSIZE | PARENB);
3838
raw.c_cflag |= CS8;
3939

4040
raw.c_cc[VMIN] = 1;

tests/embedded_cli_test.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,8 @@ static void output_putchar(void *data, char ch, bool is_last)
148148
// just ignore them
149149
if (ch >= 'A' && ch <= 'Z') {
150150
if (ch == 'K') // CLEAR_EOL
151-
memset(&output[output_pos], 0, sizeof(output) - (size_t)output_pos);
151+
memset(&output[output_pos], 0,
152+
sizeof(output) - (size_t)output_pos);
152153
have_csi = false;
153154
}
154155
} else {

0 commit comments

Comments
 (0)