Skip to content

Commit aac3d81

Browse files
committed
Merge branch 'master' of github.com:arduino/arduino-cli
2 parents 9c82aad + afdf609 commit aac3d81

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

Taskfile.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,10 @@ vars:
6363
sh: echo `go list ./... | grep -v legacy | tr '\n' ' '`
6464

6565
# build vars
66-
VERSIONSTRING: "0.3.7-alpha.preview"
6766
COMMIT:
6867
sh: echo ${TRAVIS_COMMIT:-`git log -n 1 --format=%h`}
6968
LDFLAGS: >
70-
-ldflags '-X github.com/arduino/arduino-cli/version.versionString={{.VERSIONSTRING}}
71-
-X github.com/arduino/arduino-cli/version.commit={{.COMMIT}}'
69+
-ldflags '-X github.com/arduino/arduino-cli/version.commit={{.COMMIT}}'
7270
7371
# test vars
7472
GOFLAGS: "-timeout 10m -v -coverpkg=./... -covermode=atomic"

go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ require (
4343
go.bug.st/serial.v1 v0.0.0-20180827123349-5f7892a7bb45
4444
golang.org/x/net v0.0.0-20190311183353-d8887717615a
4545
golang.org/x/text v0.3.0
46+
google.golang.org/appengine v1.4.0 // indirect
4647
google.golang.org/genproto v0.0.0-20190327125643-d831d65fe17d // indirect
4748
google.golang.org/grpc v1.21.1
4849
gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce // indirect

test/test_board.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,15 @@ def test_core_listall(run_command):
4444
def test_core_search(run_command):
4545
url = "https://raw.githubusercontent.com/arduino/arduino-cli/master/test/testdata/test_index.json"
4646
assert run_command("core update-index --additional-urls={}".format(url))
47-
# default search
47+
# list all
48+
result = run_command("core search")
49+
assert result.ok
50+
assert 3 < len(result.stdout.splitlines())
51+
result = run_command("core search --format json")
52+
assert result.ok
53+
data = json.loads(result.stdout)
54+
assert 1 < len(data)
55+
# search a specific core
4856
result = run_command("core search avr")
4957
assert result.ok
5058
assert 2 < len(result.stdout.splitlines())

version/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
)
2323

2424
var (
25-
defaultVersionString = "0.3.7-alpha.preview"
25+
defaultVersionString = "0.0.0-git"
2626
versionString = ""
2727
commit = ""
2828
)

0 commit comments

Comments
 (0)