Skip to content

Commit f45220d

Browse files
authored
update to go 1.11 and modules (osquery#66)
1 parent 30c843e commit f45220d

File tree

4 files changed

+41
-37
lines changed

4 files changed

+41
-37
lines changed

.circleci/config.yml

Lines changed: 5 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,16 @@
11
version: 2
22
jobs:
3-
build-go-latest:
3+
build-go1.11:
44
docker:
5-
- image: golang:1.10
6-
working_directory: /go/src/github.com/kolide/osquery-go
5+
- image: golang:1.11
6+
working_directory: /go/src/github.com/kolide/kit
77
steps: &steps
88
- checkout
9-
10-
- restore_cache:
11-
keys:
12-
- vendor-cache-{{ .Branch }}-{{ checksum "Gopkg.lock" }}
13-
- vendor-cache-{{ .Branch }}
14-
- vendor-cache
159
- run: make deps
16-
- save_cache:
17-
key: vendor-cache-{{ .Branch }}-{{ checksum "Gopkg.lock" }}
18-
paths:
19-
- vendor
20-
- save_cache:
21-
key: vendor-cache-{{ .Branch }}
22-
paths:
23-
- vendor
24-
- save_cache:
25-
key: vendor-cache
26-
paths:
27-
- vendor
28-
29-
- run: go test -race -cover -v $(go list ./... | grep -v /vendor/)
30-
- run: make examples
31-
32-
build-go1.9:
33-
docker:
34-
- image: golang:1.9
35-
working_directory: /go/src/github.com/kolide/osquery-go
36-
steps: *steps
10+
- run: make test
3711

3812
workflows:
3913
version: 2
4014
build:
4115
jobs:
42-
- build-go-latest
43-
- build-go1.9
44-
16+
- build-go1.11

Makefile

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
11
PATH := $(GOPATH)/bin:$(PATH)
2+
export GO111MODULE=on
23

34
all: gen examples
45

5-
deps:
6-
go get -u github.com/golang/dep/cmd/dep
7-
dep ensure -vendor-only
6+
go-mod-check:
7+
@go help mod > /dev/null || (echo "Your go is too old, no modules. Seek help." && exit 1)
8+
9+
go-mod-download:
10+
go mod download
11+
12+
deps-go: go-mod-check go-mod-download
13+
14+
deps: deps-go
815

916
gen: ./osquery.thrift
1017
mkdir ./gen
@@ -33,7 +40,7 @@ example_config: examples/config/*.go
3340
go build -o example_config ./examples/config/*.go
3441

3542
test: all
36-
go test -race -cover -v $(shell go list ./... | grep -v /vendor/)
43+
go test -race -cover ./...
3744

3845
clean:
3946
rm -rf ./build ./gen

go.mod

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
module github.com/kolide/osquery-go
2+
3+
require (
4+
git.apache.org/thrift.git v0.0.0-20180705132951-f12cacf56145
5+
github.com/Microsoft/go-winio v0.4.9
6+
github.com/davecgh/go-spew v1.1.0 // indirect
7+
github.com/pkg/errors v0.8.0
8+
github.com/pmezard/go-difflib v1.0.0 // indirect
9+
github.com/stretchr/testify v1.2.2
10+
golang.org/x/sys v0.0.0-20180815093151-14742f9018cd // indirect
11+
)

go.sum

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
git.apache.org/thrift.git v0.0.0-20180705132951-f12cacf56145 h1:cKvJzsWvFw5ZW8q+sLkIqmLnl9+MNuUbYQGoT0a/KFg=
2+
git.apache.org/thrift.git v0.0.0-20180705132951-f12cacf56145/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
3+
github.com/Microsoft/go-winio v0.4.9 h1:3RbgqgGVqmcpbOiwrjbVtDHLlJBGF6aE+yHmNtBNsFQ=
4+
github.com/Microsoft/go-winio v0.4.9/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
5+
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
6+
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
7+
github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
8+
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
9+
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
10+
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
11+
github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
12+
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
13+
golang.org/x/sys v0.0.0-20180815093151-14742f9018cd h1:Vdp9FdQnZJQQF78wgpudgkchp80Nu37AWr8+mprtgAo=
14+
golang.org/x/sys v0.0.0-20180815093151-14742f9018cd/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=

0 commit comments

Comments
 (0)