Skip to content

Commit 4d3a772

Browse files
authored
Update dependencies (#32)
* Update dependencies * Update travis CI yaml file * Fix linux eth interface
1 parent 29d204a commit 4d3a772

File tree

4 files changed

+77
-67
lines changed

4 files changed

+77
-67
lines changed

.travis.yml

+24-11
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,33 @@
1-
language: go
2-
3-
os:
4-
- linux
5-
- osx
6-
71
sudo: required
82

3+
language: go
4+
95
go:
10-
- 1.7
11-
- 1.8
12-
- tip
6+
- 1.12.x
137

14-
install: make install_ci
8+
matrix:
9+
include:
10+
- os: linux
11+
dist: trusty
12+
- os: osx
1513

16-
script: make test
1714

1815
cache:
1916
directories:
2017
- vendor
18+
19+
addons:
20+
apt:
21+
packages:
22+
- iproute2
23+
24+
before_install:
25+
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update ; fi
26+
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install iproute2mac; fi
27+
28+
install: make install_ci
29+
30+
script:
31+
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then ip a; fi
32+
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then ip link; fi
33+
- make test

Makefile

+14-22
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ $(info builddir ${builddir})
77
${builddir}:
88
mkdir -p $(builddir)
99

10-
.PHONY: bins
1110
bins: install_ci
1211
go build -o ${builddir}/arachned github.com/uber/arachne/arachned/
1312

@@ -16,35 +15,28 @@ all: bins
1615
clean:
1716
rm -f ${builddir}/*
1817

19-
20-
.PHONY: lint
18+
FILTER := grep -v -e '_string.go' -e '/gen-go/' -e '/mocks/' -e 'vendor/'
2119
lint:
22-
go vet $(PACKAGES)
23-
24-
.PHONY: test
25-
test: check-license lint install_ci
20+
@echo "Running golint"
21+
-golint $(ALL_PKGS) | $(FILTER) | tee lint.log
22+
@echo "Running go vet"
23+
-go vet $(ALL_PKGS) 2>&1 | fgrep -v -e "possible formatting directiv" -e "exit status" | tee -a lint.log
24+
@echo "Verifying files are gofmt'd"
25+
-gofmt -l . | $(FILTER) | tee -a lint.log
26+
@echo "Checking for unresolved FIXMEs"
27+
-git grep -i -n fixme | $(FILTER) | grep -v -e Makefile | tee -a lint.log
28+
@[ ! -s lint.log ]
29+
30+
test: lint install_ci
2631
find . -type f -name '*.go' | xargs golint
2732
go test $(PACKAGES)
2833

29-
.PHONY: vendor
3034
vendor: glide.lock
3135
glide install
3236

33-
.PHONY: install_ci
3437
install_ci:
3538
glide --version || go get -u -f github.com/Masterminds/glide
3639
make vendor
37-
go get -u -f github.com/golang/lint/golint
38-
39-
vendor/github.com/uber/uber-licence: vendor
40-
[ -d vendor/github.com/uber/uber-licence ] || glide install
41-
42-
vendor/github.com/uber/uber-licence/node_modules: vendor/github.com/uber/uber-licence
43-
cd vendor/github.com/uber/uber-licence && npm install
44-
45-
.PHONY: check-license add-license
46-
check-license: vendor/github.com/uber/uber-licence/node_modules
47-
./vendor/github.com/uber/uber-licence/bin/licence --dry --file '*.go'
40+
go get -u golang.org/x/lint/golint
4841

49-
add-license: vendor/github.com/uber/uber-licence/node_modules
50-
./vendor/github.com/uber/uber-licence/bin/licence --verbose --file '*.go'
42+
.PHONY: bins test vendor install_ci lint

glide.lock

+38-30
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

glide.yaml

+1-4
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,13 @@ import:
55
- statsd
66
- package: github.com/fatih/color
77
- package: github.com/google/gopacket
8-
version: ^1
98
subpackages:
109
- layers
1110
- package: github.com/jawher/mow.cli
1211
- package: github.com/miekg/dns
1312
- package: github.com/pkg/errors
1413
- package: github.com/spacemonkeygo/monotime
15-
- package: github.com/uber/uber-licence
16-
- package: github.com/uber-go/zap
17-
version: ^1
14+
- package: go.uber.org/zap
1815
subpackages:
1916
- zapcore
2017
- package: golang.org/x/net

0 commit comments

Comments
 (0)