step

Author: pillo79

.github/workflows/package_core.yml

@@ -215,12 +215,8 @@ jobs:
         run: |
           mkdir Blink/
           wget -nv https://raw.githubusercontent.com/arduino/arduino-examples/refs/heads/main/examples/01.Basics/Blink/Blink.ino -P Blink/
-          # wget -nv $(curl -s https://api.github.com/repos/arduino-libraries/ArduinoBLE/releases/latest | jq -r '.tarball_url') -O ArduinoBLE.tar.gz
-          # tar zxf ArduinoBLE.tar.gz && mv arduino-libraries-ArduinoBLE* ArduinoCore-zephyr/libraries/ArduinoBLE
-          wget -nv https://github.com/arduino-libraries/ArduinoBLE/archive/refs/heads/master.tar.gz
-          tar zxf master.tar.gz && mv ArduinoBLE-master ArduinoCore-zephyr/libraries/ArduinoBLE
           # sets ALL_TESTS and ALL_LIBRARIES env vars
-          extra/ci_test_list.sh ${{ matrix.variant }} Blink
+          extra/ci_test_list.sh ${{ matrix.artifact }} ${{ matrix.variant }} Blink
 
       - name: Compile tests for ${{ matrix.board }}
         uses: pillo79/compile-sketches@next

extra/artifacts/zephyr_main.test_setup.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# wget -nv $(curl -s https://api.github.com/repos/arduino-libraries/ArduinoBLE/releases/latest | jq -r '.tarball_url') -O ArduinoBLE.tar.gz
+# tar zxf ArduinoBLE.tar.gz && mv arduino-libraries-ArduinoBLE* ArduinoCore-zephyr/libraries/ArduinoBLE
+wget -nv https://github.com/arduino-libraries/ArduinoBLE/archive/refs/heads/master.tar.gz
+tar zxf master.tar.gz && mv ArduinoBLE-master ArduinoCore-zephyr/libraries/ArduinoBLE

extra/artifacts/zephyr_unoq.test_setup.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# wget -nv $(curl -s https://api.github.com/repos/arduino-libraries/ArduinoBLE/releases/latest | jq -r '.tarball_url') -O ArduinoBLE.tar.gz
+# tar zxf ArduinoBLE.tar.gz && mv arduino-libraries-ArduinoBLE* ArduinoCore-zephyr/libraries/ArduinoBLE
+wget -nv https://github.com/arduino-libraries/ArduinoBLE/archive/refs/heads/master.tar.gz
+tar zxf master.tar.gz && mv ArduinoBLE-master ArduinoCore-zephyr/libraries/ArduinoBLE

extra/ci_test_list.sh

@@ -6,17 +6,22 @@
 #
 # The core under test should be extracted in the 'ArduinoCore-zephyr' subdirectory.
 
-if [ -z "$GITHUB_ENV" ] || [ ! -d ArduinoCore-zephyr/ ]; then
-	echo "Not in a Github CI run, cannot proceed."
-	exit 0
+if [ "$#" -lt 2 ] ; then
+	echo "Usage: $0 <artifact> <variant> [<additional_library_paths>...]"
+	exit 1
 fi
 
-VARIANT_DIR="ArduinoCore-zephyr/variants/$1"
-if [ -z "$1" ] || [ ! -d "$VARIANT_DIR" ] ; then
-       	echo "Invalid variant '$1' specified."
+if [ -z "$GITHUB_ENV" ] || [ ! -d ArduinoCore-zephyr/ ]; then
+	echo "Not in a Github CI run, cannot proceed."
 	exit 1
 fi
-shift
+
+ARTIFACT=$1
+VARIANT_DIR="ArduinoCore-zephyr/variants/$2"
+shift 2
+
+# Run any extra setup script for the specific artifact to get additional tests in
+[ -f extra/artifacts/${ARTIFACT}.test_setup.sh ] && extra/artifacts/${ARTIFACT}.test_setup.sh
 
 echo "ALL_LIBRARIES<<EOF" >> $GITHUB_ENV
 find "$@" ArduinoCore-zephyr/libraries/ -name library.properties | while read -r propfile; do