Skip to content

Commit b29d515

Browse files
committed
Add all Microsoft Store releases to the IDE version blocklist
For the second time, the script has been broken by a tag used for a release specific to the Microsoft Store version of the Arduino IDE. Both times this happened, the tag has followed a consistent format. So I have generalized the regular expression to exclude all such tags in hopes this will prevent any future occurrences of this issue.
1 parent 8cbff7d commit b29d515

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

arduino-ci-script.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,8 @@ function install_ide() {
223223
# 1.6.5-r2: Not available for download
224224
# 1.6.5-r3: Not available for download
225225
# 1.8.11-ms-store-1: Not available for download
226-
local -r ARDUINO_CI_SCRIPT_FULL_IDE_VERSION_LIST_ARRAY="${ARDUINO_CI_SCRIPT_IDE_VERSION_LIST_ARRAY_DECLARATION}'(\"$(git ls-remote --quiet --tags --refs | grep --invert-match --regexp='refs/tags/1\.0' --regexp='refs/tags/1\.5$' --regexp='refs/tags/1\.5\.1$' --regexp='refs/tags/1\.5\.4-r2$' --regexp='refs/tags/1\.5\.5-r2$' --regexp='refs/tags/1\.5\.7-macosx-java7$' --regexp='refs/tags/1\.5\.8-macosx-java7$' ${IDEversion162regex} --regexp='refs/tags/1\.6\.5-r2$' --regexp='refs/tags/1\.6\.5-r3$' --regexp='refs/tags/1\.8\.11-ms-store-1$' | grep --regexp='refs/tags/[0-9]\+\.[0-9]\+\.[0-9]\+\(\(-.*$\)\|$\)' | cut --delimiter='/' --fields=3 | sort --version-sort | sed ':a;N;$!ba;s/\n/\" \"/g')\")'"
226+
# 1.8.13-ms-store-1: Not available for download
227+
local -r ARDUINO_CI_SCRIPT_FULL_IDE_VERSION_LIST_ARRAY="${ARDUINO_CI_SCRIPT_IDE_VERSION_LIST_ARRAY_DECLARATION}'(\"$(git ls-remote --quiet --tags --refs | grep --invert-match --regexp='refs/tags/1\.0' --regexp='refs/tags/1\.5$' --regexp='refs/tags/1\.5\.1$' --regexp='refs/tags/1\.5\.4-r2$' --regexp='refs/tags/1\.5\.5-r2$' --regexp='refs/tags/1\.5\.7-macosx-java7$' --regexp='refs/tags/1\.5\.8-macosx-java7$' ${IDEversion162regex} --regexp='refs/tags/1\.6\.5-r2$' --regexp='refs/tags/1\.6\.5-r3$' --regexp='refs/tags/.*-ms-store.*$' | grep --regexp='refs/tags/[0-9]\+\.[0-9]\+\.[0-9]\+\(\(-.*$\)\|$\)' | cut --delimiter='/' --fields=3 | sort --version-sort | sed ':a;N;$!ba;s/\n/\" \"/g')\")'"
227228
cd ..
228229
# Remove the temporary repo
229230
rm Arduino --recursive --force

0 commit comments

Comments
 (0)