Skip to content

Commit 28764e3

Browse files
committed
workflow: App logs to release images
Add application logs to mtrace images for releases. Need to add hwfc for uart1 too to avoid issues with RTT. Signed-off-by: Tommi Rantanen <tommi.rantanen@nordicsemi.no>
1 parent 820319d commit 28764e3

4 files changed

Lines changed: 43 additions & 11 deletions

File tree

.github/workflows/build.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,21 +89,25 @@ jobs:
8989
NRF54_BUILD_DIR=twister-out/nrf54l15dk_nrf54l15_cpuapp/zephyr/serial_modem/samples
9090
9191
# nRF9151 DK ext MCU builds
92-
cp ${NRF9151DK_BUILD_DIR}/serial_modem.extmcu/merged.hex \
93-
artifacts/serial_modem_${VERSION}_nrf9151dk_ext_mcu.hex
94-
cp ${NRF9151DK_BUILD_DIR}/serial_modem.extmcu.mtrace/merged.hex \
95-
artifacts/serial_modem_${VERSION}_nrf9151dk_ext_mcu_mtrace.hex
92+
cp ${NRF9151DK_BUILD_DIR}/serial_modem.ppp_cmux_extmcu/merged.hex \
93+
artifacts/serial_modem_${VERSION}_nrf9151dk_ppp_cmux_extmcu.hex
94+
cp ${NRF9151DK_BUILD_DIR}/serial_modem.ppp_cmux_extmcu.mtrace/merged.hex \
95+
artifacts/serial_modem_${VERSION}_nrf9151dk_ppp_cmux_extmcu_mtrace.hex
9696
9797
# nRF9151 DK ppp cmux builds
98-
cp ${NRF9151DK_BUILD_DIR}/serial_modem.ppp_cmux_linux/merged.hex \
98+
cp ${NRF9151DK_BUILD_DIR}/serial_modem.ppp_cmux/merged.hex \
9999
artifacts/serial_modem_${VERSION}_nrf9151dk_ppp_cmux.hex
100-
cp ${NRF9151DK_BUILD_DIR}/serial_modem.ppp_cmux_linux.mtrace/merged.hex \
100+
cp ${NRF9151DK_BUILD_DIR}/serial_modem.ppp_cmux.mtrace/merged.hex \
101101
artifacts/serial_modem_${VERSION}_nrf9151dk_ppp_cmux_mtrace.hex
102102
103-
# nRF54L15 DK builds
104-
cp ${NRF54_BUILD_DIR}/sm_at_client_shell/sample.cellular.sm_at_client_shell/merged.hex \
103+
# nRF54L15 DK AT client shell build
104+
cp ${NRF54_BUILD_DIR}/sm_at_client_shell/sample.sm_at_client_shell/merged.hex \
105105
artifacts/sm_at_client_shell_${VERSION}_nrf54l15dk.hex
106106
107+
# nRF54L15 DK PPP shell build
108+
cp ${NRF54_BUILD_DIR}/sm_ppp_shell/sample.sm_ppp_shell/merged.hex \
109+
artifacts/sm_ppp_shell_${VERSION}_nrf54l15dk.hex
110+
107111
- name: Upload artifacts
108112
if: ${{ inputs.trigger_source == 'release-workflow' }}
109113
uses: actions/upload-artifact@v4

app/overlay-uart1-hwfc.overlay

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/*
2+
* Copyright (c) 2025 Nordic Semiconductor ASA
3+
*
4+
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
5+
*/
6+
7+
&uart1 {
8+
hw-flow-control;
9+
};

app/sample.yaml

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,18 +59,22 @@ tests:
5959
- thingy91x/nrf9151/ns
6060
integration_platforms:
6161
- nrf9151dk/nrf9151/ns
62-
serial_modem.ppp_cmux_linux.mtrace:
62+
serial_modem.ppp_cmux.mtrace:
6363
sysbuild: true
6464
build_only: true
6565
extra_args:
6666
- EXTRA_CONF_FILE="overlay-cmux.conf;overlay-ppp.conf"
67+
- EXTRA_DTC_OVERLAY_FILE="overlay-uart1-hwfc.overlay"
6768
- app_SNIPPET=nrf91-modem-trace-uart
69+
extra_configs:
70+
- CONFIG_SM_LOG_LEVEL_DBG=y
71+
- CONFIG_DTR_UART_LOG_LEVEL_DBG=y
6872
platform_allow:
6973
- nrf9151dk/nrf9151/ns
7074
- thingy91x/nrf9151/ns
7175
integration_platforms:
7276
- nrf9151dk/nrf9151/ns
73-
serial_modem.ppp_cmux_with_extmcu:
77+
serial_modem.ppp_cmux_extmcu:
7478
sysbuild: true
7579
build_only: true
7680
extra_args:
@@ -80,6 +84,20 @@ tests:
8084
- nrf9151dk/nrf9151/ns
8185
integration_platforms:
8286
- nrf9151dk/nrf9151/ns
87+
serial_modem.ppp_cmux_extmcu.mtrace:
88+
sysbuild: true
89+
build_only: true
90+
extra_args:
91+
- EXTRA_CONF_FILE="overlay-cmux.conf;overlay-ppp.conf"
92+
- EXTRA_DTC_OVERLAY_FILE="overlay-external-mcu.overlay;overlay-uart1-hwfc.overlay"
93+
- app_SNIPPET=nrf91-modem-trace-uart
94+
extra_configs:
95+
- CONFIG_SM_LOG_LEVEL_DBG=y
96+
- CONFIG_DTR_UART_LOG_LEVEL_DBG=y
97+
platform_allow:
98+
- nrf9151dk/nrf9151/ns
99+
integration_platforms:
100+
- nrf9151dk/nrf9151/ns
83101
serial_modem.ppp_cmux_with_modem_trace:
84102
sysbuild: true
85103
build_only: true
@@ -160,6 +178,7 @@ tests:
160178
build_only: true
161179
extra_args:
162180
- app_SNIPPET=nrf91-modem-trace-uart
181+
- EXTRA_DTC_OVERLAY_FILE="overlay-uart1-hwfc.overlay"
163182
extra_configs:
164183
- CONFIG_SM_LOG_LEVEL_DBG=y
165184
- CONFIG_DTR_UART_LOG_LEVEL_DBG=y

samples/sm_at_client_shell/sample.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ sample:
22
description: Serial Modem Shell sample
33
name: SM shell
44
tests:
5-
sample.cellular.sm_at_client_shell:
5+
sample.sm_at_client_shell:
66
sysbuild: true
77
build_only: true
88
platform_allow:

0 commit comments

Comments
 (0)