Skip to content

Commit a27cbf7

Browse files
umbynosumbynos
authored
Fix amd64 darwin install wrong tool (amd64) (#753)
* add go-paths-helper lib * make GOOS and GOARCH global vars to allow testing * add test to replicate #751 * use and old version of the lib, (in the new version the algorithm was changed 🤷‍♂️) * add tool download for m1
1 parent 38f2d67 commit a27cbf7

File tree

6 files changed

+175
-11
lines changed

6 files changed

+175
-11
lines changed

‎.licenses/arduino-create-agent/go/github.com/xrash/smetrics.dep.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
---
22
name: github.com/xrash/smetrics
3-
version: v0.0.0-20201216005158-039620a65673
3+
version: v0.0.0-20170218160415-a3153f7040e9
44
type: go
5-
summary: Package smetrics provides a bunch of algorithms for calculating the distance
6-
between strings.
5+
summary:
76
homepage: https://pkg.go.dev/github.com/xrash/smetrics
87
license: mit
98
licenses:

‎go.mod‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ go 1.19
55
require (
66
github.com/andela/gin-cors v0.0.0-20160928171741-e8c3436a37e2
77
github.com/arduino/arduino-cli v0.0.0-20210422154105-5aa424818026
8+
github.com/arduino/go-paths-helper v1.8.0
89
github.com/blang/semver v3.5.1+incompatible
910
github.com/codeclysm/extract/v3 v3.1.0
1011
github.com/getlantern/systray v1.1.0
@@ -20,7 +21,7 @@ require (
2021
github.com/sirupsen/logrus v1.9.0
2122
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
2223
github.com/stretchr/testify v1.8.1
23-
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673
24+
github.com/xrash/smetrics v0.0.0-20170218160415-a3153f7040e9
2425
go.bug.st/downloader/v2 v2.1.1
2526
go.bug.st/serial v1.4.1
2627
goa.design/goa v1.0.1-0.20190116060309-40843d63b0e4

‎go.sum‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ github.com/arduino/arduino-cli v0.0.0-20210422154105-5aa424818026/go.mod h1:5dWr
1414
github.com/arduino/board-discovery v0.0.0-20180823133458-1ba29327fb0c/go.mod h1:HK7SpkEax/3P+0w78iRQx1sz1vCDYYw9RXwHjQTB5i8=
1515
github.com/arduino/go-paths-helper v1.0.1/go.mod h1:HpxtKph+g238EJHq4geEPv9p+gl3v5YYu35Yb+w31Ck=
1616
github.com/arduino/go-paths-helper v1.2.0/go.mod h1:HpxtKph+g238EJHq4geEPv9p+gl3v5YYu35Yb+w31Ck=
17-
github.com/arduino/go-paths-helper v1.4.0 h1:ilnseAdxmN1bFnLxxXHRtcdmt9jBf3O4jtYfWfqule4=
1817
github.com/arduino/go-paths-helper v1.4.0/go.mod h1:V82BWgAAp4IbmlybxQdk9Bpkz8M4Qyx+RAFKaG9NuvU=
18+
github.com/arduino/go-paths-helper v1.8.0 h1:BfA1bq1XktnlqwfUDCoKbUqB3YFPe6X7szPSZj6Rdpk=
19+
github.com/arduino/go-paths-helper v1.8.0/go.mod h1:V82BWgAAp4IbmlybxQdk9Bpkz8M4Qyx+RAFKaG9NuvU=
1920
github.com/arduino/go-properties-orderedmap v1.3.0/go.mod h1:DKjD2VXY/NZmlingh4lSFMEYCVubfeArCsGPGDwb2yk=
2021
github.com/arduino/go-timeutils v0.0.0-20171220113728-d1dd9e313b1b/go.mod h1:uwGy5PpN4lqW97FiLnbcx+xx8jly5YuPMJWfVwwjJiQ=
2122
github.com/arduino/go-win32-utils v0.0.0-20180330194947-ed041402e83b/go.mod h1:iIPnclBMYm1g32Q5kXoqng4jLhMStReIP7ZxaoUC2y8=
@@ -316,8 +317,8 @@ github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPU
316317
github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4=
317318
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
318319
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
319-
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
320-
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
320+
github.com/xrash/smetrics v0.0.0-20170218160415-a3153f7040e9 h1:w8V9v0qVympSF6GjdjIyeqR7+EVhAF9CBQmkmW7Zw0w=
321+
github.com/xrash/smetrics v0.0.0-20170218160415-a3153f7040e9/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
321322
github.com/zach-klippenstein/goregen v0.0.0-20160303162051-795b5e3961ea h1:CyhwejzVGvZ3Q2PSbQ4NRRYn+ZWv5eS1vlaEusT+bAI=
322323
github.com/zach-klippenstein/goregen v0.0.0-20160303162051-795b5e3961ea/go.mod h1:eNr558nEUjP8acGw8FFjTeWvSgU1stO7FAO6eknhHe4=
323324
go.bug.st/cleanup v1.0.0/go.mod h1:EqVmTg2IBk4znLbPD28xne3abjsJftMdqqJEjhn70bk=

‎tools/download.go‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,19 @@ type index struct {
6767
var systems = map[string]string{
6868
"linuxamd64": "x86_64-linux-gnu",
6969
"linux386": "i686-linux-gnu",
70-
"darwinamd64": "apple-darwin",
70+
"darwinamd64": "i686-apple-darwin",
71+
"darwinarm64": "arm64-apple-darwin",
7172
"windows386": "i686-mingw32",
7273
"windowsamd64": "i686-mingw32",
7374
"linuxarm": "arm-linux-gnueabihf",
7475
}
7576

77+
// public vars to allow override in the tests
78+
var (
79+
OS = runtime.GOOS
80+
Arch = runtime.GOARCH
81+
)
82+
7683
func mimeType(data []byte) (string, error) {
7784
return http.DetectContentType(data[0:512]), nil
7885
}
@@ -321,7 +328,7 @@ func findTool(pack, name, version string, data index) (tool, system) {
321328
maxSimilarity := 0.7
322329

323330
for _, s := range correctTool.Systems {
324-
similarity := smetrics.Jaro(s.Host, systems[runtime.GOOS+runtime.GOARCH])
331+
similarity := smetrics.Jaro(s.Host, systems[OS+Arch])
325332
if similarity > maxSimilarity {
326333
correctSystem = s
327334
maxSimilarity = similarity
@@ -587,7 +594,7 @@ func (t *Tools) installDrivers(location string) error {
587594
OkPressed := 6
588595
extension := ".bat"
589596
preamble := ""
590-
if runtime.GOOS != "windows" {
597+
if OS != "windows" {
591598
extension = ".sh"
592599
// add ./ to force locality
593600
preamble = "./"
@@ -599,7 +606,7 @@ func (t *Tools) installDrivers(location string) error {
599606
os.Chdir(location)
600607
t.Logger(preamble + "post_install" + extension)
601608
oscmd := exec.Command(preamble + "post_install" + extension)
602-
if runtime.GOOS != "linux" {
609+
if OS != "linux" {
603610
// spawning a shell could be the only way to let the user type his password
604611
TellCommandNotToSpawnShell(oscmd)
605612
}

‎tools/download_test.go‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,55 @@
1616
package tools
1717

1818
import (
19+
"encoding/json"
1920
"fmt"
2021
"io/ioutil"
2122
"net/http"
2223
"os"
2324
"path"
2425
"testing"
2526

27+
"github.com/arduino/go-paths-helper"
2628
"github.com/stretchr/testify/assert"
29+
"github.com/stretchr/testify/require"
2730
)
2831

32+
func TestDownloadCorrectPlatform(t *testing.T) {
33+
testCases := []struct {
34+
hostOS string
35+
hostArch string
36+
correctOSArch string
37+
}{
38+
{"linux", "amd64", "x86_64-linux-gnu"},
39+
{"linux", "386", "i686-linux-gnu"},
40+
{"darwin", "amd64", "x86_64-apple-darwin"},
41+
{"darwin", "arm64", "arm64-apple-darwin"},
42+
{"windows", "386", "i686-mingw32"},
43+
{"windows", "amd64", "i686-mingw32"},
44+
{"linux", "arm", "arm-linux-gnueabihf"},
45+
}
46+
testIndex := paths.New("testdata", "test_tool_index.json")
47+
buf, err := testIndex.ReadFile()
48+
require.NoError(t, err)
49+
50+
var data index
51+
err = json.Unmarshal(buf, &data)
52+
require.NoError(t, err)
53+
for _, tc := range testCases {
54+
t.Run(tc.hostOS+tc.hostArch, func(t *testing.T) {
55+
OS = tc.hostOS // override `runtime.OS` for testing purposes
56+
Arch = tc.hostArch // override `runtime.ARCH` for testing purposes
57+
// Find the tool by name
58+
correctTool, correctSystem := findTool("arduino-test", "arduino-fwuploader", "2.2.2", data)
59+
require.NotNil(t, correctTool)
60+
require.NotNil(t, correctSystem)
61+
require.Equal(t, correctTool.Name, "arduino-fwuploader")
62+
require.Equal(t, correctTool.Version, "2.2.2")
63+
require.Equal(t, correctSystem.Host, tc.correctOSArch)
64+
})
65+
}
66+
}
67+
2968
func Test_findBaseDir(t *testing.T) {
3069
cases := []struct {
3170
dirList []string

‎tools/testdata/test_tool_index.json‎

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
{
2+
"packages": [
3+
{
4+
"name": "arduino-test",
5+
"maintainer": "Arduino",
6+
"websiteURL": "http://www.arduino.cc/",
7+
"email": "[email protected]",
8+
"help": {
9+
"online": "http://www.arduino.cc/en/Reference/HomePage"
10+
},
11+
"platforms": [
12+
{
13+
"name": "Arduino megaAVR Boards - Pre-release",
14+
"architecture": "megaavr",
15+
"version": "1.8.102",
16+
"category": "Arduino",
17+
"url": "http://downloads.arduino.cc/cores/staging/core-megaavr-1.8.102.tar.bz2",
18+
"archiveFileName": "core-megaavr-1.8.102.tar.bz2",
19+
"checksum": "SHA-256:ad5e60b828678d9ccff957032524a4c4d68b218737e7df24b905769a04dc2a6a",
20+
"size": "858620",
21+
"help": {
22+
"online": "https://github.com/arduino/ArduinoCore-megaavr/issues"
23+
},
24+
"boards": [
25+
{
26+
"name": "Arduino Uno WiFi Rev2"
27+
},
28+
{
29+
"name": "Arduino Nano Every"
30+
}
31+
],
32+
"toolsDependencies": [
33+
{
34+
"packager": "arduino",
35+
"name": "avr-gcc",
36+
"version": "7.3.0-atmel3.6.1-arduino5"
37+
},
38+
{
39+
"packager": "arduino",
40+
"name": "avrdude",
41+
"version": "7.0-arduino.3"
42+
},
43+
{
44+
"packager": "arduino",
45+
"name": "arduinoOTA",
46+
"version": "1.3.0"
47+
}
48+
]
49+
}
50+
],
51+
"tools": [
52+
{
53+
"name": "arduino-fwuploader",
54+
"version": "2.2.2",
55+
"systems": [
56+
{
57+
"host": "i686-linux-gnu",
58+
"url": "http://downloads.arduino.cc/arduino-fwuploader/arduino-fwuploader_2.2.2_Linux_32bit.tar.gz",
59+
"archiveFileName": "arduino-fwuploader_2.2.2_Linux_32bit.tar.gz",
60+
"checksum": "SHA-256:503b9f8b24c6e396d09eb64f0e1f625c6f9aa5a90b01a50d7dec6477f4a866f0",
61+
"size": "7262873"
62+
},
63+
{
64+
"host": "x86_64-linux-gnu",
65+
"url": "http://downloads.arduino.cc/arduino-fwuploader/arduino-fwuploader_2.2.2_Linux_64bit.tar.gz",
66+
"archiveFileName": "arduino-fwuploader_2.2.2_Linux_64bit.tar.gz",
67+
"checksum": "SHA-256:8d77d0b33c8b0787fe3b80191709b69d638ef2a447d9853536cda35bfafd274b",
68+
"size": "7306763"
69+
},
70+
{
71+
"host": "i686-mingw32",
72+
"url": "http://downloads.arduino.cc/arduino-fwuploader/arduino-fwuploader_2.2.2_Windows_32bit.zip",
73+
"archiveFileName": "arduino-fwuploader_2.2.2_Windows_32bit.zip",
74+
"checksum": "SHA-256:74ad9a5d369204b51be288c98d74f949ceb7a0c227ee64eb65ae179ec884c84c",
75+
"size": "7450717"
76+
},
77+
{
78+
"host": "x86_64-mingw32",
79+
"url": "http://downloads.arduino.cc/arduino-fwuploader/arduino-fwuploader_2.2.2_Windows_64bit.zip",
80+
"archiveFileName": "arduino-fwuploader_2.2.2_Windows_64bit.zip",
81+
"checksum": "SHA-256:b25ac549cb0645166613c96cf899aebc541e482fe196aada6408bd7cff2c7d02",
82+
"size": "7390999"
83+
},
84+
{
85+
"host": "x86_64-apple-darwin",
86+
"url": "http://downloads.arduino.cc/arduino-fwuploader/arduino-fwuploader_2.2.2_macOS_64bit.tar.gz",
87+
"archiveFileName": "arduino-fwuploader_2.2.2_macOS_64bit.tar.gz",
88+
"checksum": "SHA-256:2cd6168ff470457b5124ba0faf118f315be2d1b9fb4fef43eb74370cd83620a2",
89+
"size": "7306576"
90+
},
91+
{
92+
"host": "arm64-apple-darwin",
93+
"url": "http://downloads.arduino.cc/arduino-fwuploader/arduino-fwuploader_2.2.2_macOS_ARM64.tar.gz",
94+
"archiveFileName": "arduino-fwuploader_2.2.2_macOS_ARM64.tar.gz",
95+
"checksum": "SHA-256:10ae5614af4d82096b6ba0e1e07aab667fa140d2bf1d5e3407dd8ad4c6748195",
96+
"size": "6878214"
97+
},
98+
{
99+
"host": "arm-linux-gnueabihf",
100+
"url": "http://downloads.arduino.cc/arduino-fwuploader/arduino-fwuploader_2.2.2_Linux_ARMv6.tar.gz",
101+
"archiveFileName": "arduino-fwuploader_2.2.2_Linux_ARMv6.tar.gz",
102+
"checksum": "SHA-256:5aadf6e50ffe620635faf941fdf82c0765c8cba4830951bb53267ad125fc5af8",
103+
"size": "6940393"
104+
},
105+
{
106+
"host": "aarch64-linux-gnu",
107+
"url": "http://downloads.arduino.cc/arduino-fwuploader/arduino-fwuploader_2.2.2_Linux_ARM64.tar.gz",
108+
"archiveFileName": "arduino-fwuploader_2.2.2_Linux_ARM64.tar.gz",
109+
"checksum": "SHA-256:6d11a4f4aa5a81de865f3d18ca395a2780fdbb1e1597a2b11b2b5329e09f30fd",
110+
"size": "6829396"
111+
}
112+
]
113+
}
114+
]
115+
}
116+
]
117+
}

0 commit comments

Comments
 (0)