Skip to content

Commit 63d23dd

Browse files
committed
Merged tls-client and server build
1 parent 1119e67 commit 63d23dd

2 files changed

Lines changed: 10 additions & 16 deletions

File tree

.github/workflows/stm32h5-tls-m33mu.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,13 @@ jobs:
2424
git clone --depth 1 https://github.com/wolfSSL/wolfssl.git
2525
echo "wolfSSL cloned to /tmp/wolfssl"
2626
27-
- name: Build TLS Server Binary
27+
- name: Build TLS Server + Client Binaries
2828
working-directory: src/port/stm32h563
2929
run: |
3030
CC=arm-none-eabi-gcc OBJCOPY=arm-none-eabi-objcopy \
31-
make test-server WOLFSSL_ROOT=/tmp/wolfssl
31+
make test-m33mu WOLFSSL_ROOT=/tmp/wolfssl
3232
ls -lh app-server.bin
3333
echo "Server binary size: $(stat -c%s app-server.bin) bytes"
34-
35-
- name: Build TLS Client Binary
36-
working-directory: src/port/stm32h563
37-
run: |
38-
CC=arm-none-eabi-gcc OBJCOPY=arm-none-eabi-objcopy \
39-
make test-client WOLFSSL_ROOT=/tmp/wolfssl
4034
ls -lh app-client.bin
4135
echo "Client binary size: $(stat -c%s app-client.bin) bytes"
4236

src/port/stm32h563/Makefile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -258,15 +258,15 @@ $(WOLFSSL_ROOT)/%.o: $(WOLFSSL_ROOT)/%.c
258258
# m33mu Test Targets
259259
# -----------------------------------------------------------------------------
260260

261-
# Build TLS server for m33mu testing
262-
test-server:
261+
# Build TLS server/client for m33mu testing (same recipe)
262+
test-server test-client:
263263
$(MAKE) clean
264-
$(MAKE) app-server.bin ENABLE_TLS=1 BUILD_MODE=SERVER M33MU_TEST=1
264+
$(MAKE) app-$(subst test-,,$@).bin ENABLE_TLS=1 M33MU_TEST=1 BUILD_MODE=$(if $(findstring server,$@),SERVER,CLIENT)
265265

266-
# Build TLS client for m33mu testing
267-
test-client:
268-
$(MAKE) clean
269-
$(MAKE) app-client.bin ENABLE_TLS=1 BUILD_MODE=CLIENT M33MU_TEST=1
266+
# Build both TLS server and client for m33mu testing
267+
test-m33mu:
268+
$(MAKE) test-server
269+
$(MAKE) test-client
270270

271271
app-server.elf: $(OBJS) $(LDSCRIPT)
272272
$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) -Wl,--start-group -lc -lm -lgcc -lnosys -Wl,--end-group -o $@
@@ -315,7 +315,7 @@ size: app.elf
315315
@echo "Flash usage: $$(arm-none-eabi-size app.elf | awk 'NR==2{printf "%.1f%% (%d / %d bytes)", ($$1+$$2)*100/2097152, $$1+$$2, 2097152}')"
316316
@echo "RAM usage (static): $$(arm-none-eabi-size app.elf | awk 'NR==2{printf "%.1f%% (%d / %d bytes)", ($$2+$$3)*100/655360, $$2+$$3, 655360}')"
317317

318-
.PHONY: all clean verify size test-server test-client
318+
.PHONY: all clean verify size test-server test-client test-m33mu
319319

320320
# -----------------------------------------------------------------------------
321321
# Help

0 commit comments

Comments
 (0)