Skip to content

Commit

Permalink
Fixed ci
Browse files Browse the repository at this point in the history
  • Loading branch information
yyoshiki41 committed Nov 9, 2016
1 parent 59f1f39 commit f35dfff
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 6 deletions.
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,11 @@ go:

sudo: false

install:
- make get-deps

script:
- go test -outjp -race -coverprofile=coverage.txt -covermode=atomic
- make test-ci

after_success:
- bash <(curl -s https://codecov.io/bash)
18 changes: 13 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,18 +1,26 @@
PKG=$(shell go list ./...)
PKGS=$(shell go list ./...)

.PHONY: all help test test-out
.PHONY: all help init test test-out

all: help

help:
@echo "make init #=> Run init scripts"
@echo "make test #=> Run tests"
@echo "make test-out #=> Run tests from outside Japan"

init: get-deps

test:
go test $(PKG)
go test $(PKGS)

test-out:
go test -outjp $(PKG)
go test -outjp $(PKGS)

test-ci:
go test -outjp -race -coverprofile=coverage.txt -covermode=atomic $(PKG)
@echo "go test"
@go test -outjp -race -coverprofile=coverage.txt -covermode=atomic $(PKGS)

get-deps:
@echo "go get go-radiko dependencies"
@go get -v $(PKGS)

0 comments on commit f35dfff

Please sign in to comment.