Skip to content

Commit d2ed1f4

Browse files
committed
change membrowse target to board/target and remove redundant continue-on-error directive
fix defsym can be followed by = or ,
1 parent 115b26a commit d2ed1f4

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

.github/workflows/build_util.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ jobs:
7979

8080
- name: Membrowse Upload
8181
if: inputs.toolchain != 'esp-idf' && inputs.upload-membrowse == true
82-
continue-on-error: true # have server busy issue with membrowse
8382
env:
8483
MEMBROWSE_API_KEY: ${{ secrets.MEMBROWSE_API_KEY }}
8584
run: |

hw/bsp/family_support.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ while [ -n \"$pending_ld_scripts\" ]; do \
310310
done; \
311311
ld_scripts=\"$(echo \"$all_ld_scripts\" | xargs)\"")
312312
set(MEMBROWSE_LD_DEFS_CMD
313-
"ld_symbols=\"$(${CMAKE_MAKE_PROGRAM} -C ${CMAKE_BINARY_DIR} -t commands ${TARGET} | grep -oP '(?<=--defsym=)[^[:space:]]+' | xargs)\"; \
313+
"ld_symbols=\"$(${CMAKE_MAKE_PROGRAM} -C ${CMAKE_BINARY_DIR} -t commands ${TARGET} | grep -oP '(?<=--defsym[=,])[^[:space:]]+' | xargs)\"; \
314314
ld_defs=\"\"; \
315315
for symbol in $ld_symbols; do \
316316
ld_defs=\"$ld_defs --def $symbol\"; \
@@ -327,7 +327,7 @@ ld_defs=\"$(echo \"$ld_defs\" | xargs)\"")
327327
fi; \
328328
else \
329329
if [ \"$MEMBROWSE_UPLOAD\" = \"1\" ]; then \
330-
MEMBROWSE_CMD=\"${MEMBROWSE_EXE} report ${OPTION} --identical --upload --github --target-name ${FAMILY}/${BOARD}/${TARGET} --api-key $ENV{MEMBROWSE_API_KEY}\"; \
330+
MEMBROWSE_CMD=\"${MEMBROWSE_EXE} report ${OPTION} --identical --upload --github --target-name ${BOARD}/${TARGET} --api-key $ENV{MEMBROWSE_API_KEY}\"; \
331331
else \
332332
MEMBROWSE_CMD=\"${MEMBROWSE_EXE} report ${OPTION} --identical\"; \
333333
fi; \

0 commit comments

Comments
 (0)