Skip to content

Commit

Permalink
Merge pull request mmatczuk#27 from mmatczuk/mmt/integrationtest
Browse files Browse the repository at this point in the history
Integration test refactoring
  • Loading branch information
mmatczuk authored Aug 7, 2017
2 parents 1a7e59c + 2203f1d commit 1ac9993
Show file tree
Hide file tree
Showing 7 changed files with 353 additions and 370 deletions.
15 changes: 4 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,15 @@
language: go
sudo: false

go:
- tip

matrix:
fast_finish: true
- 1.8
- 1.7

addons:
apt:
packages:
- moreutils

before_install:
- make devtools

install:
- go get -d ./...
- make get-deps

script:
- make check
- make
39 changes: 24 additions & 15 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,30 @@ OUTPUT_DIR = build
OS = "darwin freebsd linux windows"
ARCH = "amd64 arm"
OSARCH = "!darwin/arm !windows/arm"

GIT_COMMIT = $(shell git describe --always)

all: check
all: check test

.PHONY: check
check:
gofmt -s -l . | ifne false
go vet ./...
golint ./...
go build ./...
go test -race ./...
misspell ./...
ineffassign .

.PHONY: test
test:
go test -cover -race ./...

.PHONY: release
release: check test clean build package

.PHONY: clean
clean:
go clean ./...
rm -rf ${OUTPUT_DIR}

.PHONY: devtools
devtools:
go get -u github.com/golang/lint/golint
go get -u github.com/golang/mock/gomock
go get -u github.com/mitchellh/gox
go get -u github.com/tcnksm/ghr

.PHONY: release
release: clean check build package publish

.PHONY: build
build:
mkdir ${OUTPUT_DIR}
Expand All @@ -45,4 +41,17 @@ package:

.PHONY: publish
publish:
ghr -recreate -u mmatczuk -t ${GITHUB_TOKEN} -r go-http-tunnel pre-release ${OUTPUT_DIR}/dist
ghr -recreate -u mmatczuk -t ${GITHUB_TOKEN} -r go-http-tunnel pre-release ${OUTPUT_DIR}/dist

.PHONY: get-deps
get-deps:
go get -t ./...

go get -u github.com/golang/lint/golint
go get -u github.com/golang/mock/gomock
go get -u github.com/client9/misspell/cmd/misspell
go get -u github.com/gordonklaus/ineffassign

go get -u github.com/mitchellh/gox
go get -u github.com/tcnksm/ghr

Loading

0 comments on commit 1ac9993

Please sign in to comment.