Skip to content

Commit 08f9855

Browse files
authored
Merge pull request #3639 from michael-membrowse/membrowse_map_support
ci: MemBrowse - add libraries mapping support
2 parents 4e64f3e + 0a18f30 commit 08f9855

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
types: [ published ]
1010

1111
concurrency:
12-
group: ${{ github.workflow }}-${{ github.ref }}
12+
group: ${{ github.workflow }}-${{ github.event_name == 'push' && github.sha || github.ref }}
1313
cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
1414

1515
jobs:

hw/bsp/family_support.cmake

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,10 +326,12 @@ ld_defs=\"$(echo \"$ld_defs\" | xargs)\"")
326326
"if [ -f \"${TARGET_ELF_PATH}\" ]; then \
327327
${MEMBROWSE_LD_SCRIPTS_CMD}; \
328328
${MEMBROWSE_LD_DEFS_CMD}; \
329+
map_arg=\"\"; \
330+
if [ -f \"${TARGET_ELF_PATH}.map\" ]; then map_arg=\"--map-file \\\"${TARGET_ELF_PATH}.map\\\"\"; fi; \
329331
if [ \"$MEMBROWSE_UPLOAD\" = \"1\" ]; then \
330-
MEMBROWSE_CMD=\"${MEMBROWSE_EXE} report ${OPTION} \\\"${TARGET_ELF_PATH}\\\" \\\"$ld_scripts\\\" $ld_defs --upload --github --target-name ${BOARD}/${TARGET} --api-key $ENV{MEMBROWSE_API_KEY}\"; \
332+
MEMBROWSE_CMD=\"${MEMBROWSE_EXE} report ${OPTION} \\\"${TARGET_ELF_PATH}\\\" \\\"$ld_scripts\\\" $ld_defs $map_arg --upload --github --target-name ${BOARD}/${TARGET} --api-key $ENV{MEMBROWSE_API_KEY}\"; \
331333
else \
332-
MEMBROWSE_CMD=\"${MEMBROWSE_EXE} report ${OPTION} \\\"${TARGET_ELF_PATH}\\\" \\\"$ld_scripts\\\" $ld_defs\"; \
334+
MEMBROWSE_CMD=\"${MEMBROWSE_EXE} report ${OPTION} \\\"${TARGET_ELF_PATH}\\\" \\\"$ld_scripts\\\" $ld_defs $map_arg\"; \
333335
fi; \
334336
else \
335337
if [ \"$MEMBROWSE_UPLOAD\" = \"1\" ]; then \

0 commit comments

Comments
 (0)