wiip

Author: pillo79

.github/workflows/package_core.yml

@@ -21,15 +21,21 @@ jobs:
       - name: Initialize
         run: |
           ./extra/bootstrap.sh
-          ./extra/build_all.sh
-          ./extra/package.sh `git describe --always`
-          mv ../arduino-core-zephyr-llext* .
+          echo "CORE_TAG=$(git describe --always)" >> "$GITHUB_ENV"
+
+      - name: Build
+        run: ./extra/build_all.sh
+
+      - name: Package
+        run: |
+          ./extra/package.sh ${{ env.CORE_TAG }}
+          mv ../ArduinoCore-zephyr-* .
 
       - name: Archive core
         uses: actions/upload-artifact@v4
         with:
-          name: Core
-          path: arduino-core-zephyr-llext*
+          name: ArduinoCore-zephyr-${{ env.CORE_TAG }}
+          path: ArduinoCore-zephyr-${{ env.CORE_TAG }}.*
 
       - name: Create Blink sketch
         run: |

extra/build.sh

@@ -31,11 +31,6 @@ if [ -z "${variant}" ] ; then
 	exit 1
 fi
 
-echo && echo && echo
-echo ${variant}
-echo ${variant} | sed -e 's/./=/g'
-echo
-
 # Build the loader
 BUILD_DIR=build/${variant}
 VARIANT_DIR=variants/${variant}

extra/build_all.sh

@@ -1,9 +1,56 @@
 #!/bin/bash
-#
-set -e
+
+FORCE=false
+LOG=false
+
+while getopts "hfl" opt; do
+	case $opt in
+		h)
+			echo "Usage: $0 [-hfl]"
+			echo "  -h  Show this help message"
+			echo "  -f  Force build all targets"
+			echo "  -l  Log build output to file"
+			exit 0
+			;;
+		f)      FORCE=true ;;
+		l)      LOG=true ;;
+		*)
+			echo "Invalid option: -$OPTARG" >&2
+			exit 1
+			;;
+	esac
+done
+
+if [ ! -z "$GITHUB_STEP_SUMMARY" ] ; then
+	echo "### Variant build results:" >> "$GITHUB_STEP_SUMMARY"
+fi
 
 jq -cr '.[]' < ./extra/targets.json | while read -r item; do
-  board=$(jq -cr '.board' <<< "$item")
-  args=$(jq -cr '.args' <<< "$item")
-  ./extra/build.sh "$board" $args
+	board=$(jq -cr '.board' <<< "$item")
+	args=$(jq -cr '.args' <<< "$item")
+
+	variant=$(extra/get_variant_name.sh "$board" || echo "$board")
+	if [ -z "$GITHUB_STEP_SUMMARY" ] ; then
+		echo && echo && echo
+		echo ${variant}
+		echo ${variant} | sed -e 's/./=/g'
+		echo
+	else
+		echo "::group::${variant}"
+	fi
+
+	./extra/build.sh "$board" $args
+	result=$?
+
+	if [ ! -z "$GITHUB_STEP_SUMMARY" ] ; then
+		if [ $result -eq 0 ] ; then
+			echo "- :heavy_check_mark: \`${variant}\`" >> "$GITHUB_STEP_SUMMARY"
+		else
+			echo "::error::Build failure for ${variant}"
+			echo "- :x: \`${variant}\`" >> "$GITHUB_STEP_SUMMARY"
+		fi
+		echo "::endgroup::"
+	fi
+
+	[ $result -ne 0 ] && ! $FORCE && exit $result
 done

extra/get_variant_name.sh

@@ -3,7 +3,7 @@ set -e
 
 # Get the variant name (NORMALIZED_BOARD_TARGET in Zephyr)
 tmpdir=$(mktemp -d)
-variant=$(cmake -DBOARD=$1 -P extra/get_variant_name.cmake | grep 'VARIANT=' | cut -d '=' -f 2)
+variant=$(cmake "-DBOARD=$1" -P extra/get_variant_name.cmake 2>/dev/null | grep 'VARIANT=' | cut -d '=' -f 2)
 rm -rf ${tmpdir}
 
 echo $variant

extra/package.sh

@@ -10,4 +10,5 @@ FOLDER=`basename $PWD`
 VERSION=$1
 
 cd ..
-tar  --exclude=extras/** --exclude=.git* --exclude=build --exclude=venv --exclude=samples -cjhf arduino-core-zephyr-llext-${VERSION}.tar.bz2 $FOLDER
+tar  --exclude=extras/** --exclude=.git* --exclude=build --exclude=venv --exclude=samples -cjhf arduino-core-zephyr-${VERSION}.tar.bz2 $FOLDER
+[ -z "$GITHUB_ENV" ] || echo "CORE_PACKAGE=arduino-core-zephyr-${VERSION}.tar.bz2" >> $GITHUB_ENV"]