From 805ac2d207da21019e19b6ce197c100ca75834d5 Mon Sep 17 00:00:00 2001 From: Alissa Huskey Date: Wed, 13 Nov 2019 01:01:39 -0700 Subject: [PATCH] Fix missing path in bootstrap.sh breaking CI Add DEPENDENCIES_FOLDER path to ARDUINO_FILE missing in subshell. Also add additional debug output viewable in CI log. --- tests/script/bootstrap/arduino.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/script/bootstrap/arduino.sh b/tests/script/bootstrap/arduino.sh index f118646..d64fc4b 100644 --- a/tests/script/bootstrap/arduino.sh +++ b/tests/script/bootstrap/arduino.sh @@ -29,13 +29,15 @@ if [ -z "$ARDUINO_DIR" ] || ! test -e $ARDUINO_DIR || [ $OS == "cygwin" ]; then echo "Downloading Arduino IDE..." download $ARDUINO_URL $ARDUINO_FILE - if [[ ! "$(file --mime-type $ARDUINO_FILE)" =~ application\/zip ]]; then + download_type="$(file --mime-type $DEPENDENCIES_FOLDER/$ARDUINO_FILE)" + if [[ ! "$download_type" =~ application\/zip ]]; then mv $ARDUINO_FILE "bad-$ARDUINO_FILE" echo echo "[ERROR] Unable to download valid IDE for testing" - echo " Download the IDE manually then try again." + echo " Downloaded file should be a zip but is: ${download_type##* }." echo + echo " Download the IDE manually then try again." echo " Download from: https://www.arduino.cc/en/Main/Software" echo " Save to : $DEPENDENCIES_FOLDER" exit 1