From 1c2265ef5535d9f8dbd519ac04cc9b18a70d5ce1 Mon Sep 17 00:00:00 2001 From: david gauchard Date: Sat, 21 Nov 2020 12:20:00 +0100 Subject: [PATCH 1/4] use arduino 1.8.13 in CI --- tests/common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/common.sh b/tests/common.sh index 0c6ac9540d..8ff3ce0773 100755 --- a/tests/common.sh +++ b/tests/common.sh @@ -152,7 +152,7 @@ function install_ide() #local idever='nightly' #local ideurl='https://www.arduino.cc/download.php?f=/arduino-nightly' - local idever='1.8.10' + local idever='1.8.13' local ideurl="https://downloads.arduino.cc/arduino-$idever" echo "using Arduino IDE distribution ${idever}" From 4f4d5939886ddda26dca7022af23ee8afed4b52b Mon Sep 17 00:00:00 2001 From: david gauchard Date: Sat, 21 Nov 2020 12:24:30 +0100 Subject: [PATCH 2/4] trying with 1.8.12 --- tests/common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/common.sh b/tests/common.sh index 8ff3ce0773..e40a100614 100755 --- a/tests/common.sh +++ b/tests/common.sh @@ -152,7 +152,7 @@ function install_ide() #local idever='nightly' #local ideurl='https://www.arduino.cc/download.php?f=/arduino-nightly' - local idever='1.8.13' + local idever='1.8.12' local ideurl="https://downloads.arduino.cc/arduino-$idever" echo "using Arduino IDE distribution ${idever}" From a2f441be3e081a99b37869e71fbdcb8e4f6ec5e3 Mon Sep 17 00:00:00 2001 From: david gauchard Date: Sat, 21 Nov 2020 12:40:07 +0100 Subject: [PATCH 3/4] with 1.8.11 --- tests/common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/common.sh b/tests/common.sh index e40a100614..860ef9c672 100755 --- a/tests/common.sh +++ b/tests/common.sh @@ -152,7 +152,7 @@ function install_ide() #local idever='nightly' #local ideurl='https://www.arduino.cc/download.php?f=/arduino-nightly' - local idever='1.8.12' + local idever='1.8.11' local ideurl="https://downloads.arduino.cc/arduino-$idever" echo "using Arduino IDE distribution ${idever}" From 9530201393f4e29b67a1b81c4e9ee4297af7efbe Mon Sep 17 00:00:00 2001 From: david gauchard Date: Thu, 31 Dec 2020 23:09:12 +0100 Subject: [PATCH 4/4] fixes per review from @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 4769ba892b..5898196ef5 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.11' - 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}"