@@ -16,6 +16,14 @@ ARTIFACT=$1
1616VERSION=$2
1717OUTPUT_FILE=${3:- distrib/ ${ARTIFACT} -${VERSION} .tar.bz2}
1818
19+ log_msg () {
20+ if [ -n $GITHUB_WORKSPACE ] ; then
21+ echo " ::$1 ::$2 "
22+ else
23+ echo " $2 "
24+ fi
25+ }
26+
1927# we use variants for include because we filter on file paths
2028# and boards for exclude because we want to remove matching lines in boards.txt
2129BOARD_DETAILS=$( extra/get_board_details.sh)
3139 EXCLUDED_BOARDS=$( echo ${BOARD_DETAILS} | jq -cr " map(select(.artifact != \" $ARTIFACT \" )) | .[].board" )
3240fi
3341
34- [ -n $GITHUB_WORKSPACE ] && echo " ::group:: Packaging ${ARTIFACT_NAME:- all variants} ($( basename $OUTPUT_FILE ) )"
42+ log_msg group " Packaging ${ARTIFACT_NAME:- all variants} ($( basename $OUTPUT_FILE ) )"
3543
3644# create a temporary boards.txt file with the correct list of boards
3745TEMP_BOARDS=$( mktemp -p . | sed ' s/\.\///' )
@@ -50,6 +58,7 @@ cat platform.txt > ${TEMP_PLATFORM}
5058sed -ie " s/^version=.*/version=$( extra/get_core_version.sh) /" ${TEMP_PLATFORM}
5159
5260declutter_file () {
61+ # remove comments and empty lines
5362 [ -f " $1 " ] || return 0
5463 cat " $1 " | sed -e ' s/\s*#.*//' | grep -v ' ^\s*$'
5564}
@@ -61,7 +70,7 @@ echo ${TEMP_PLATFORM} >> ${TEMP_INC}
6170declutter_file extra/artifacts/_common.inc >> ${TEMP_INC}
6271declutter_file extra/artifacts/$ARTIFACT .inc >> ${TEMP_INC}
6372for variant in $INCLUDED_VARIANTS ; do
64- echo " ::info:: \` ${variant} \` "
73+ echo " - ${variant} "
6574 echo " variants/${variant} /" >> ${TEMP_INC}
6675 ls firmwares/zephyr-${variant} .* >> ${TEMP_INC}
6776done
@@ -78,4 +87,4 @@ tar -cjhf ${OUTPUT_FILE} -X ${TEMP_EXC} -T ${TEMP_INC} \
7887 --transform " s,^,ArduinoCore-zephyr/,"
7988rm -f ${TEMP_INC} ${TEMP_EXC} ${TEMP_BOARDS} ${TEMP_PLATFORM}
8089
81- [ -n $GITHUB_WORKSPACE ] && echo " :: endgroup:: "
90+ log_msg endgroup
0 commit comments