diff --git a/.travis.yml b/.travis.yml index f660622..03aeb7e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,20 +11,20 @@ matrix: - go get -u golang.org/x/tools/cmd/... script: - dep ensure - - go test -v $(go list ./... | grep -v /vendor/) - - go vet $(go list ./... | grep -v /vendor/) + - go test -v $(go list ./...) + - go vet $(go list ./...) - diff <(goimports -d $(find . -type f -name '*.go' -not -path "./vendor/*")) <(printf "") - - (for d in $(go list ./... | grep -v /vendor/); do diff <(golint $d) <(printf "") || exit 1; done) + - (for d in $(go list ./...); do diff <(golint $d) <(printf "") || exit 1; done) # Using HEAD of dependencies - install: - go get -t ./... - go get -u github.com/golang/lint/... - go get -u golang.org/x/tools/cmd/... script: - - go test -v $(go list ./... | grep -v /vendor/) - - go vet $(go list ./... | grep -v /vendor/) + - go test -v $(go list ./...) + - go vet $(go list ./...) - diff <(goimports -d $(find . -type f -name '*.go' -not -path "./vendor/*")) <(printf "") - - (for d in $(go list ./... | grep -v /vendor/); do diff <(golint $d) <(printf "") || exit 1; done) + - (for d in $(go list ./...); do diff <(golint $d) <(printf "") || exit 1; done) allow_failures: # Using HEAD of dependencies - install: @@ -32,10 +32,10 @@ matrix: - go get -u github.com/golang/lint/... - go get -u golang.org/x/tools/cmd/... script: - - go test -v $(go list ./... | grep -v /vendor/) - - go vet $(go list ./... | grep -v /vendor/) + - go test -v $(go list ./...) + - go vet $(go list ./...) - diff <(goimports -d $(find . -type f -name '*.go' -not -path "./vendor/*")) <(printf "") - - (for d in $(go list ./... | grep -v /vendor/); do diff <(golint $d) <(printf "") || exit 1; done) + - (for d in $(go list ./...); do diff <(golint $d) <(printf "") || exit 1; done) notifications: irc: channels: diff --git a/Dockerfile b/Dockerfile index 4f7ba20..e9854f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,18 @@ FROM golang:alpine AS build-env -LABEL maintainer "Jimmy Zelinskie " +LABEL maintainer "Jimmy Zelinskie " # Install OS-level dependencies. RUN apk update && \ - apk add curl git && \ - curl https://glide.sh/get | sh + apk add curl git # Copy our source code into the container. WORKDIR /go/src/github.com/chihaya/chihaya COPY . /go/src/github.com/chihaya/chihaya # Install our golang dependencies and compile our binary. -RUN glide install -RUN CGO_ENABLED=0 go install github.com/chihaya/chihaya/cmd/chihaya +RUN go get -u github.com/golang/dep/... +RUN dep ensure +RUN CGO_ENABLED=0 go install github.com/chihaya/chihaya/cmd/... FROM alpine:latest COPY --from=build-env /go/bin/chihaya /chihaya diff --git a/README.md b/README.md index caa8aca..fe05b74 100644 --- a/README.md +++ b/README.md @@ -77,18 +77,18 @@ $ $GOPATH/bin/chihaya --help #### Reproducible Builds -Reproducible builds are handled by using [glide] to vendor dependencies. +Reproducible builds are handled by using [dep] to vendor dependencies. ```sh $ mkdir chihaya && export GOPATH=$PWD/chihaya $ git clone git@github.com:chihaya/chihaya.git $GOPATH/src/github.com/chihaya/chihaya $ cd $GOPATH/src/github.com/chihaya/chihaya -$ glide install +$ dep ensure $ go install github.com/chihaya/chihaya/cmd/... $ $GOPATH/bin/chihaya --help ``` -[glide]: https://glide.sh +[dep]: https://github.com/golang/dep #### Docker @@ -103,7 +103,7 @@ The following will run all tests and benchmarks. Removing `-bench` will just run unit tests. ```sh -$ go test -bench $(glide novendor | grep -v contrib) +$ go test -bench $(go list ./...) ``` ### Contributing