From 27ba6d869bf62543dadcf9ba942f41e12082e24e Mon Sep 17 00:00:00 2001 From: Matteo Suppo Date: Wed, 25 Mar 2020 10:38:19 +0100 Subject: [PATCH] Bump required go version to 1.14 Fixed faulty json because of new behaviour of encoding/json: > encoding/json > Number no longer accepts invalid numbers, to follow the documented behavior more closely. Signed-off-by: Matteo Suppo --- .github/workflows/docs.yaml | 2 +- .github/workflows/test.yaml | 2 +- Dockerfiles/builder/Dockerfile | 2 +- .../testdata/package_Zoubworld_index.json | 118 +++++++++--------- .../testdata/package_infineon_index.json | 2 +- client_example/go.mod | 2 +- docsgen/go.mod | 2 +- go.mod | 2 +- 8 files changed, 66 insertions(+), 66 deletions(-) diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index fae1b248549..c97a8c71524 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -37,7 +37,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2-beta with: - go-version: '1.13' + go-version: '1.14' - name: Install Go dependencies run: | diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index ab333d4f17e..dc6df0487cd 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -25,7 +25,7 @@ jobs: - name: Install Go uses: actions/setup-go@v1 with: - go-version: '1.13' + go-version: '1.14' - name: Install Go deps # Since 10/23/2019 pwsh is the default shell diff --git a/Dockerfiles/builder/Dockerfile b/Dockerfiles/builder/Dockerfile index c8cf088ce6e..64bde10b9d3 100644 --- a/Dockerfiles/builder/Dockerfile +++ b/Dockerfiles/builder/Dockerfile @@ -5,7 +5,7 @@ ENV PATH $PATH:/usr/local/go/bin # Install tooling ENV GORELEASER_VER 0.113.0 ENV GORELEASER_SHA 2379beebb6369b75ccead7f7a43269de700b51821feae3857701d106ed72bd63 -ENV GOVER 1.13 +ENV GOVER 1.14 RUN set -ex \ && curl -o goreleaser.tar.gz -LO https://github.com/goreleaser/goreleaser/releases/download/v${GORELEASER_VER}/goreleaser_Linux_x86_64.tar.gz \ && echo "$GORELEASER_SHA goreleaser.tar.gz" | sha256sum -c - || exit 1 \ diff --git a/arduino/cores/packageindex/testdata/package_Zoubworld_index.json b/arduino/cores/packageindex/testdata/package_Zoubworld_index.json index b529626fe5e..ec4c9a36932 100644 --- a/arduino/cores/packageindex/testdata/package_Zoubworld_index.json +++ b/arduino/cores/packageindex/testdata/package_Zoubworld_index.json @@ -11,61 +11,61 @@ }, "platforms": [ -{ - "name": "zoubworld SAM M0+ Boards", - "architecture": "samd", - "version": "1.6.33", - "category": "Contributed", - "help": { - "online": "https://www.zoubworld.com/support/" - }, - "url": "http://zoubworld.hd.free.fr/~zoubworld_Arduino/files/Release/Zoubworld_sam_m0p-1.6.33.tar.bz2", - "archiveFileName": "Zoubworld_sam_m0p-1.6.33.tar.bz2", - "checksum": "SHA-256:66f6db1f48a422ecfa42e4377a5f7f29bc7550829ab24cbf322f1b184fc77d75", - "size": "7397802", - "boards": [ - {"name": "Pilo"}, - {"name": "Captor"}, - {"name": "line"} - ], - "toolsDependencies": [ - { - "packager": "arduino", - "name": "arm-none-eabi-gcc", - "version": "4.8.3-2014q1" - }, - { - "packager": "zoubworld_Arduino", - "name": "bossac", - "version": "1.7.1-zoubworld-4" - }, - { - "packager": "arduino", - "name": "openocd", - "version": "0.9.0-arduino" - }, - { - "packager": "arduino", - "name": "CMSIS", - "version": "4.0.0-atmel" - }, - { - "packager": "zoubworld_Arduino", - "name": "CMSIS-Atmel", - "version": "1.1.7-Zoubworld" - }, - { - "packager": "zoubworld_Arduino", - "name": "UsbDriver", - "version": "1.1.1-Zoubworld" - }, - { - "packager": "arduino", - "name": "arduinoOTA", - "version": "1.2.0" - } - ] -} +{ + "name": "zoubworld SAM M0+ Boards", + "architecture": "samd", + "version": "1.6.33", + "category": "Contributed", + "help": { + "online": "https://www.zoubworld.com/support/" + }, + "url": "http://zoubworld.hd.free.fr/~zoubworld_Arduino/files/Release/Zoubworld_sam_m0p-1.6.33.tar.bz2", + "archiveFileName": "Zoubworld_sam_m0p-1.6.33.tar.bz2", + "checksum": "SHA-256:66f6db1f48a422ecfa42e4377a5f7f29bc7550829ab24cbf322f1b184fc77d75", + "size": "7397802", + "boards": [ + {"name": "Pilo"}, + {"name": "Captor"}, + {"name": "line"} + ], + "toolsDependencies": [ + { + "packager": "arduino", + "name": "arm-none-eabi-gcc", + "version": "4.8.3-2014q1" + }, + { + "packager": "zoubworld_Arduino", + "name": "bossac", + "version": "1.7.1-zoubworld-4" + }, + { + "packager": "arduino", + "name": "openocd", + "version": "0.9.0-arduino" + }, + { + "packager": "arduino", + "name": "CMSIS", + "version": "4.0.0-atmel" + }, + { + "packager": "zoubworld_Arduino", + "name": "CMSIS-Atmel", + "version": "1.1.7-Zoubworld" + }, + { + "packager": "zoubworld_Arduino", + "name": "UsbDriver", + "version": "1.1.1-Zoubworld" + }, + { + "packager": "arduino", + "name": "arduinoOTA", + "version": "1.2.0" + } + ] +} ], "tools": [ { @@ -182,28 +182,28 @@ "url": "http://zoubworld.hd.free.fr/~zoubworld_Arduino/files/Release/JLink_MacOSX_V630c.pkg", "archiveFileName": "JLink_MacOSX_V630c.pkg", "checksum": "SHA-256:", - "size": "" + "size": "0" }, { "host": "x86_64-pc-linux-gnu", "url": "http://zoubworld.hd.free.fr/~zoubworld_Arduino/files/Release/JLink_Linux_V630c_x86_64.tgz", "archiveFileName": "JLink_Linux_V630c_x86_64.tgz", "checksum": "SHA-256:", - "size": "" + "size": "0" }, { "host": "i686-pc-linux-gnu", "url": "http://zoubworld.hd.free.fr/~zoubworld_Arduino/files/Release/JLink_Linux_V630c_i386.tgz", "archiveFileName": "JLink_Linux_V630c_i386.tgz", "checksum": "SHA-256:", - "size": "" + "size": "0" }, { "host": "arm-linux-gnueabihf", "url": "http://zoubworld.hd.free.fr/~zoubworld_Arduino/files/Release/JLink_Linux_V630c_arm.tgz", "archiveFileName": "JLink_Linux_V630c_arm.tgz", "checksum": "SHA-256:", - "size": "" + "size": "0" }, { "host": "all", diff --git a/arduino/cores/packageindex/testdata/package_infineon_index.json b/arduino/cores/packageindex/testdata/package_infineon_index.json index 266992dcc0c..19c1443cd1f 100644 --- a/arduino/cores/packageindex/testdata/package_infineon_index.json +++ b/arduino/cores/packageindex/testdata/package_infineon_index.json @@ -371,7 +371,7 @@ "url":"https://github.com/Infineon/XMC-for-Arduino/releases/download/V1.1.2/XMC_IFX_1.1.2.zip", "archiveFileName":"XMC_IFX_1.1.2.zip", "checksum":"SHA-256:c9247f7a02b03cb3b69e8b2f120f5e9d92f529954c2d71a0a13774a61ba8f025", - "size":"1480694 ", + "size":"1480694", "help":{ "online":"https://github.com/Infineon/XMC-for-Arduino" }, diff --git a/client_example/go.mod b/client_example/go.mod index 7bce3c37a40..ae31dbb6be1 100644 --- a/client_example/go.mod +++ b/client_example/go.mod @@ -1,6 +1,6 @@ module github.com/arduino/arduino-cli/client_example -go 1.13 +go 1.14 replace github.com/arduino/arduino-cli => ../ diff --git a/docsgen/go.mod b/docsgen/go.mod index 85ce4dd6dc2..40807169abe 100644 --- a/docsgen/go.mod +++ b/docsgen/go.mod @@ -1,6 +1,6 @@ module github.com/arduino/arduino-cli/docsgen -go 1.13 +go 1.14 require ( github.com/arduino/arduino-cli v0.0.0-20200228161349-4b874a02b096 diff --git a/go.mod b/go.mod index ecd9e81aefe..36b6983841d 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/arduino/arduino-cli -go 1.13 +go 1.14 require ( bou.ke/monkey v1.0.1