package_core: mark a release with tags when available

Use the tag name to mark the release if it exists, otherwise fall back
to the commit hash. This ultimately only affects the version in the
JSON, not the generated tarball file, to allow sync-zephyr-artifacts to
work with any Git commit.

Signed-off-by: Luca Burelli <[email protected]>

Author: pillo79

.github/workflows/package_core.yml

@@ -30,7 +30,7 @@ jobs:
       - name: Initialize Zephyr environment
         run: |
           yes | ./extra/bootstrap.sh -o=--filter=tree:0
-          echo "CORE_TAG=$(git describe --always)" >> "$GITHUB_ENV"
+          echo "CORE_TAG=$(git describe --tags --exact-match || git describe --always)" >> "$GITHUB_ENV"
           echo "CORE_ARTIFACT=ArduinoCore-zephyr-$(git describe --always)" >> "$GITHUB_ENV"
           echo "BOARD_VARIANTS=$(extra/get_board_details.sh | jq -cr 'sort_by(.variant)')" >> "$GITHUB_ENV"
 
@@ -46,7 +46,7 @@ jobs:
 
       - name: Package core
         run: |
-          ./extra/package_core.sh ${{ env.CORE_TAG }}
+          ./extra/package_core.sh ${{ env.CORE_TAG }} distrib/${{ env.CORE_ARTIFACT }}.tar.bz2
 
       - name: Archive core
         uses: actions/upload-artifact@v4

extra/package_core.sh

@@ -3,7 +3,7 @@
 set -e
 
 if [ -z "$1" ]; then
-	echo "Usage: $0 VERSION"
+	echo "Usage: $0 VERSION [OUTPUT_FILE]"
 	exit 1
 fi
 
@@ -14,6 +14,7 @@ fi
 
 PACKAGE=ArduinoCore-zephyr
 VERSION=$1
+OUTPUT_FILE=${2:-distrib/${PACKAGE}-${VERSION}.tar.bz2}
 
 # create a temporary platform.txt file with the correct version
 TEMP_PLATFORM=$(mktemp -p . | sed 's/\.\///')
@@ -32,6 +33,6 @@ extra/get_board_details.sh | jq -cr '.[]' | while read -r item; do
 	ls firmwares/zephyr-${variant}.* >> ${TEMP_LIST}
 done
 cat ${TEMP_LIST}
-mkdir -p distrib
-tar -cjhf distrib/${PACKAGE}-${VERSION}.tar.bz2 -X extra/package_core.exc -T ${TEMP_LIST} --transform "s,${TEMP_PLATFORM},platform.txt," --transform "s,^,${PACKAGE}/,"
+mkdir -p $(dirname ${OUTPUT_FILE})
+tar -cjhf ${OUTPUT_FILE} -X extra/package_core.exc -T ${TEMP_LIST} --transform "s,${TEMP_PLATFORM},platform.txt," --transform "s,^,${PACKAGE}/,"
 rm -f ${TEMP_LIST} ${TEMP_PLATFORM}