Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dep; update travis, dist, test, coverage #954

Merged
merged 1 commit into from
Oct 30, 2017
Merged

dep; update travis, dist, test, coverage #954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ sudo: false
before_install:
- go get github.com/mattn/goveralls
script:
- curl -s https://raw.githubusercontent.com/pote/gpm/v1.4.0/bin/gpm > gpm
- chmod +x gpm
- ./gpm install
- wget -O dep https://github.com/golang/dep/releases/download/v0.3.2/dep-linux-amd64
- chmod +x dep
- ./dep ensure
- ./test.sh
- ./coverage.sh --coveralls
notifications:
Expand Down
11 changes: 0 additions & 11 deletions Godeps
View file
Open in desktop

This file was deleted.

70 changes: 70 additions & 0 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

70 changes: 70 additions & 0 deletions Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@

# Gopkg.toml example
#
# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
# for detailed Gopkg.toml documentation.
#
# required = ["github.com/user/thing/cmd/thing"]
# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
#
# [[constraint]]
# name = "github.com/user/project"
# version = "1.0.0"
#
# [[constraint]]
# name = "github.com/user/project2"
# branch = "dev"
# source = "github.com/myfork/project2"
#
# [[override]]
# name = "github.com/x/y"
# version = "2.4.0"


[[constraint]]
name = "github.com/BurntSushi/toml"
revision = "2dff11163ee667d51dcc066660925a92ce138deb"

[[constraint]]
name = "github.com/bitly/go-hostpool"
revision = "a3a6125de9329587178a9792dc8f4bc98e620d2d"

[[constraint]]
name = "github.com/bitly/timer_metrics"
revision = "afad1794bb13e2a094720aeb27c088aa64564895"

[[constraint]]
name = "github.com/blang/semver"
revision = "9bf7bff48b0388cb75991e58c6df7d13e982f1f2"

[[constraint]]
name = "github.com/bmizerany/perks"
revision = "6cb9d9d729303ee2628580d9aec5db968da3a607"

[[constraint]]
name = "github.com/golang/snappy"
revision = "d9eb7a3d35ec988b8585d4a0068e462c27d28380"

[[constraint]]
name = "github.com/judwhite/go-svc"
revision = "63c12402f579f0bdf022653c821a1aa5d7544f01"

[[constraint]]
name = "github.com/julienschmidt/httprouter"
revision = "6aacfd5ab513e34f7e64ea9627ab9670371b34e7"

[[constraint]]
name = "github.com/mreiferson/go-options"
revision = "77551d20752b54535462404ad9d877ebdb26e53d"

[[constraint]]
name = "github.com/nsqio/go-diskqueue"
revision = "0681a1afee1245efa503b7543989fc26d8f268bc"

[[constraint]]
name = "github.com/nsqio/go-nsq"
revision = "a53d495e81424aaf7a7665a9d32a97715c40e953"

[[constraint]]
name = "golang.org/x/sys"
branch = "master"
2 changes: 1 addition & 1 deletion coverage.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ push_to_coveralls() {
-ignore="nsqadmin/bindata.go" || true
}

generate_cover_data $(go list ./...)
generate_cover_data $(go list ./... | grep -v /vendor/)
show_csv_report

case "$1" in
Expand Down
5 changes: 1 addition & 4 deletions dist.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@ set -e
DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
rm -rf $DIR/dist/docker
mkdir -p $DIR/dist/docker
rm -rf $DIR/.godeps
mkdir -p $DIR/.godeps
export GOPATH=$DIR/.godeps:$GOPATH
GOPATH=$DIR/.godeps gpm install
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've always liked that dist.sh preserves the state of my GOPATH, should we maintain that property?

Copy link
Contributor Author

@judwhite judwhite Oct 29, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mreiferson With dep you don't have to change GOPATH, it uses ./vendor. Maybe I misunderstood you?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perfect!

dep ensure

GOFLAGS='-ldflags="-s -w"'
arch=$(go env GOARCH)
Expand Down
4 changes: 2 additions & 2 deletions test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/bash
set -e

GOMAXPROCS=1 go test -timeout 90s ./...
GOMAXPROCS=4 go test -timeout 90s -race ./...
GOMAXPROCS=1 go test -timeout 90s $(go list ./... | grep -v /vendor/)
GOMAXPROCS=4 go test -timeout 90s -race $(go list ./... | grep -v /vendor/)

# no tests, but a build is something
for dir in apps/*/ bench/*/; do
Expand Down