Skip to content

Commit decc48b

Browse files
committed
Merge branch 'master' into cli-inception
2 parents e866372 + f432aa3 commit decc48b

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,12 @@ To build, run the following commands:
6363
go get github.com/go-errors/errors
6464
go get github.com/stretchr/testify
6565
go get github.com/jstemmer/go-junit-report
66-
go get github.com/arduino/go-properties-map
67-
go get github.com/arduino/go-timeutils
66+
go get -u github.com/arduino/go-properties-map
67+
go get -u github.com/arduino/go-timeutils
68+
go get google.golang.org/grpc
69+
go get github.com/golang/protobuf/proto
70+
go get golang.org/x/net/context
71+
go get github.com/fsnotify/fsnotify
6872
go get github.com/arduino/arduino-builder
6973
go build github.com/arduino/arduino-builder/arduino-builder
7074
```

arduino-builder/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ import (
5454
"github.com/go-errors/errors"
5555
)
5656

57-
const VERSION = "1.3.25"
57+
const VERSION = "1.4.0"
5858

5959
const FLAG_ACTION_COMPILE = "compile"
6060
const FLAG_ACTION_PREPROCESS = "preprocess"

test/helper_tools_downloader.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ func DownloadCoresAndToolsAndLibraries(t *testing.T) {
113113
OsUrl{Os: "i686-mingw32", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino11-i686-mingw32.zip"},
114114
OsUrl{Os: "x86_64-apple-darwin", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino11-x86_64-apple-darwin.zip"},
115115
OsUrl{Os: "arm-linux-gnueabihf", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino11-armv6-linux-gnueabihf.tar.bz2"},
116+
OsUrl{Os: "aarch64-linux-gnu", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino11-aarch64-linux-gnu.tar.bz2"},
116117
},
117118
},
118119
Tool{Name: "arduino-preprocessor", Version: "0.1.5",
@@ -122,6 +123,7 @@ func DownloadCoresAndToolsAndLibraries(t *testing.T) {
122123
OsUrl{Os: "i686-mingw32", Url: "https://github.com/arduino/arduino-preprocessor/releases/download/0.1.5/arduino-preprocessor-0.1.5-i686-w64-mingw32.tar.bz2"},
123124
OsUrl{Os: "x86_64-apple-darwin", Url: "https://github.com/arduino/arduino-preprocessor/releases/download/0.1.5/arduino-preprocessor-0.1.5-x86_64-apple-darwin11.tar.bz2"},
124125
OsUrl{Os: "arm-linux-gnueabihf", Url: "https://github.com/arduino/arduino-preprocessor/releases/download/0.1.5/arduino-preprocessor-0.1.5-arm-linux-gnueabihf.tar.bz2"},
126+
OsUrl{Os: "aarch64-linux-gnu", Url: "https://github.com/arduino/arduino-preprocessor/releases/download/0.1.5/arduino-preprocessor-0.1.5-aarch64-linux-gnu.tar.bz2"},
125127
},
126128
},
127129
}

0 commit comments

Comments
 (0)