From 4da8ec141e2260cf4e5dcea9a4ca01e39d529e2b Mon Sep 17 00:00:00 2001 From: nickg Date: Thu, 8 Mar 2018 17:49:58 -0800 Subject: [PATCH] travis --- .travis.yml | 2 +- Makefile | 17 +---------------- scripts/build.sh | 18 ++++++++++++++++++ scripts/pre-commit.sh | 2 +- scripts/setup.sh | 10 ++++++++++ scripts/travis.sh | 3 +++ 6 files changed, 34 insertions(+), 18 deletions(-) create mode 100755 scripts/build.sh create mode 100755 scripts/setup.sh create mode 100755 scripts/travis.sh diff --git a/.travis.yml b/.travis.yml index 79f19a5..b296b38 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ group: edge git: depth: 1 script: - - make -e ci + - ./scripts/travis.sh # calls goreleaser when a new tag is pushed deploy: diff --git a/Makefile b/Makefile index 127f7dc..862ab77 100644 --- a/Makefile +++ b/Makefile @@ -4,22 +4,7 @@ install: ## install misspell into GOPATH/bin go install ./cmd/misspell build: hooks ## build and lint misspell - dep ensure - go install ./cmd/misspell - gometalinter \ - --vendor \ - --deadline=60s \ - --disable-all \ - --enable=vet \ - --enable=golint \ - --enable=gofmt \ - --enable=goimports \ - --enable=gosimple \ - --enable=staticcheck \ - --enable=ineffassign \ - --exclude=/usr/local/go/src/net/lookup_unix.go \ - ./... - go test . + ./scripts/build.sh test: ## run all tests go test . diff --git a/scripts/build.sh b/scripts/build.sh new file mode 100755 index 0000000..737796c --- /dev/null +++ b/scripts/build.sh @@ -0,0 +1,18 @@ +#!/bin/sh +set -ex +dep ensure +go install ./cmd/misspell +gometalinter \ + --vendor \ + --deadline=60s \ + --disable-all \ + --enable=vet \ + --enable=golint \ + --enable=gofmt \ + --enable=goimports \ + --enable=gosimple \ + --enable=staticcheck \ + --enable=ineffassign \ + --exclude=/usr/local/go/src/net/lookup_unix.go \ + ./... +go test . diff --git a/scripts/pre-commit.sh b/scripts/pre-commit.sh index 291c45a..7730059 100755 --- a/scripts/pre-commit.sh +++ b/scripts/pre-commit.sh @@ -1,2 +1,2 @@ #!/bin/sh -ex -make ci +./scripts/build.sh diff --git a/scripts/setup.sh b/scripts/setup.sh new file mode 100755 index 0000000..174b1a1 --- /dev/null +++ b/scripts/setup.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +# DEP +curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh + +# GOMETALINTER +go get -u github.com/alecthomas/gometalinter && gometalinter --install + +# remove the default misspell to make sure +rm -f `which misspell` diff --git a/scripts/travis.sh b/scripts/travis.sh new file mode 100755 index 0000000..44d5970 --- /dev/null +++ b/scripts/travis.sh @@ -0,0 +1,3 @@ +#!/bin/sh +./scripts/setup.sh +./scripts/build.sh