Skip to content

Commit b7689d8

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 ce62cd1 commit b7689d8

3 files changed

Lines changed: 36 additions & 15 deletions

File tree

.github/workflows/build.yml

Lines changed: 17 additions & 13 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
96-
97-
# nRF9151 DK ppp cmux builds
98-
cp ${NRF9151DK_BUILD_DIR}/serial_modem.ppp_cmux_linux/merged.hex \
99-
artifacts/serial_modem_${VERSION}_nrf9151dk_ppp_cmux.hex
100-
cp ${NRF9151DK_BUILD_DIR}/serial_modem.ppp_cmux_linux.mtrace/merged.hex \
101-
artifacts/serial_modem_${VERSION}_nrf9151dk_ppp_cmux_mtrace.hex
102-
103-
# nRF54L15 DK builds
104-
cp ${NRF54_BUILD_DIR}/sm_at_client_shell/sample.cellular.sm_at_client_shell/merged.hex \
92+
cp ${NRF9151DK_BUILD_DIR}/serial_modem.ppp_cmux_with_extmcu/merged.hex \
93+
artifacts/serial_modem_${VERSION}_nrf9151dk_extmcu.hex
94+
cp ${NRF9151DK_BUILD_DIR}/serial_modem.ppp_cmux_with_extmcu.mtrace/merged.hex \
95+
artifacts/serial_modem_${VERSION}_nrf9151dk_extmcu_mtrace.hex
96+
97+
# nRF9151 DK normal builds
98+
cp ${NRF9151DK_BUILD_DIR}/serial_modem.ppp_cmux/merged.hex \
99+
artifacts/serial_modem_${VERSION}_nrf9151dk_normal.hex
100+
cp ${NRF9151DK_BUILD_DIR}/serial_modem.ppp_cmux.mtrace/merged.hex \
101+
artifacts/serial_modem_${VERSION}_nrf9151dk_normal_mtrace.hex
102+
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/sample.yaml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,15 @@ 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
6871
platform_allow:
6972
- nrf9151dk/nrf9151/ns
7073
- thingy91x/nrf9151/ns
@@ -80,6 +83,19 @@ tests:
8083
- nrf9151dk/nrf9151/ns
8184
integration_platforms:
8285
- nrf9151dk/nrf9151/ns
86+
serial_modem.ppp_cmux_with_extmcu.mtrace:
87+
sysbuild: true
88+
build_only: true
89+
extra_args:
90+
- EXTRA_CONF_FILE="overlay-cmux.conf;overlay-ppp.conf"
91+
- EXTRA_DTC_OVERLAY_FILE="overlay-external-mcu.overlay;overlay-uart1-hwfc.overlay"
92+
- app_SNIPPET=nrf91-modem-trace-uart
93+
extra_configs:
94+
- CONFIG_SM_LOG_LEVEL_DBG=y
95+
platform_allow:
96+
- nrf9151dk/nrf9151/ns
97+
integration_platforms:
98+
- nrf9151dk/nrf9151/ns
8399
serial_modem.ppp_cmux_with_modem_trace:
84100
sysbuild: true
85101
build_only: true
@@ -160,6 +176,7 @@ tests:
160176
build_only: true
161177
extra_args:
162178
- app_SNIPPET=nrf91-modem-trace-uart
179+
- EXTRA_DTC_OVERLAY_FILE="overlay-uart1-hwfc.overlay"
163180
extra_configs:
164181
- CONFIG_SM_LOG_LEVEL_DBG=y
165182
- 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)