From 5b42e73baaa793e2716a62a2a38a7c7d3062a03a Mon Sep 17 00:00:00 2001 From: david gauchard Date: Thu, 31 Dec 2020 23:19:58 +0100 Subject: [PATCH] upgrade arduino in CI (#7716) Thanks to @matthijskooijman, @per1234 and @earlephilhower --- tests/common.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/common.sh b/tests/common.sh index 76a3f32d8..5898196ef 100755 --- a/tests/common.sh +++ b/tests/common.sh @@ -82,7 +82,8 @@ function build_sketches() if [ -e $cache_dir/core/*.a ]; then # We need to preserve the build.options.json file and replace the last .ino # with this sketch's ino file, or builder will throw everything away. - sed -i "s,^.*sketchLocation.*$, \"sketchLocation\": \"$sketch\"\,,g" $build_dir/build.options.json + jq '."sketchLocation" = "'$sketch'"' $build_dir/build.options.json > $build_dir/build.options.json.tmp + mv $build_dir/build.options.json.tmp $build_dir/build.options.json # Set the time of the cached core.a file to the future so the GIT header # we regen won't cause the builder to throw it out and rebuild from scratch. touch -d 'now + 1 day' $cache_dir/core/*.a @@ -153,11 +154,11 @@ function install_libraries() function install_ide() { - #local idever='nightly' - #local ideurl='https://www.arduino.cc/download.php?f=/arduino-nightly' + local idever='nightly' + local ideurl='https://www.arduino.cc/download.php?f=/arduino-nightly' - local idever='1.8.10' - local ideurl="https://downloads.arduino.cc/arduino-$idever" + #local idever='1.8.10' + #local ideurl="https://downloads.arduino.cc/arduino-$idever" echo "using Arduino IDE distribution ${idever}"