Skip to content

Commit 77f95b7

Browse files
committed
update verion, remove errchek and update go version
1 parent e68bbb1 commit 77f95b7

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

Makefile

+4-10
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,21 @@
11
BINARY=salt-bootstrap
22

3-
VERSION=0.13.0
3+
VERSION=0.13.1
44
BUILD_TIME=$(shell date +%FT%T)
55
LDFLAGS=-ldflags "-X github.com/hortonworks/salt-bootstrap/saltboot.Version=${VERSION} -X github.com/hortonworks/salt-bootstrap/saltboot.BuildTime=${BUILD_TIME}"
66
GOFILES_NOVENDOR = $(shell find . -type f -name '*.go' -not -path "./vendor/*" -not -path "./.git/*")
77

88

9-
deps: deps-errcheck
9+
deps:
1010
go get github.com/gliderlabs/glu
1111
go get -u github.com/golang/dep/cmd/dep
1212

13-
deps-errcheck:
14-
go get -u github.com/kisielk/errcheck
15-
1613
clean:
1714
rm -rf build
1815

1916
all: build
2017

21-
_check: errcheck formatcheck vet
18+
_check: formatcheck vet
2219

2320
formatcheck:
2421
([ -z "$(shell gofmt -d $(GOFILES_NOVENDOR))" ]) || (echo "Source is unformatted"; exit 1)
@@ -32,16 +29,13 @@ vet:
3229
test:
3330
go test -timeout 30s -coverprofile coverage -race $$(go list ./... | grep -v /vendor/)
3431

35-
errcheck:
36-
errcheck -ignoretests -exclude errcheck.exclude ./...
37-
3832
_build: build-darwin build-linux build-ppc64le
3933

4034
build: _check test _build
4135

4236
build-docker:
4337
@#USER_NS='-u $(shell id -u $(whoami)):$(shell id -g $(whoami))'
44-
docker run --rm ${USER_NS} -v "${PWD}":/go/src/github.com/hortonworks/salt-bootstrap -w /go/src/github.com/hortonworks/salt-bootstrap -e VERSION=${VERSION} golang:1.9.2 make deps-errcheck build
38+
docker run --rm ${USER_NS} -v "${PWD}":/go/src/github.com/hortonworks/salt-bootstrap -w /go/src/github.com/hortonworks/salt-bootstrap -e VERSION=${VERSION} golang:1.13.1 make build
4539

4640
build-darwin:
4741
GOOS=darwin go build -a -installsuffix cgo ${LDFLAGS} -o build/Darwin/${BINARY} main.go

saltboot/salt.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ func writePillarImpl(pillar SaltPillar, basePath string) (outStr string, err err
307307

308308
jsonDef := []byte("#!json\n")
309309
jsn, _ := json.MarshalIndent(pillar.Json, "", "\t")
310-
err = ioutil.WriteFile(file, append(jsonDef,jsn...), 0644)
310+
err = ioutil.WriteFile(file, append(jsonDef, jsn...), 0644)
311311
if err != nil {
312312
return "Failed to write to " + file, err
313313
}

0 commit comments

Comments
 (0)