Skip to content

Commit

Permalink
Another try to fix travis
Browse files Browse the repository at this point in the history
  • Loading branch information
Andre Hahn committed Jun 21, 2016
1 parent 1a70c4a commit 3a11f5e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
11 changes: 7 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
language: go

env:
- DOCKER_VERSION: 1.10.1-0~trusty
- DOCKER_COMPOSE_VERSION: 1.7.1
global:
- DOCKER_VERSION=1.10.1-0~trusty
- DOCKER_COMPOSE_VERSION=1.7.1

go:
- 1.6.2
Expand All @@ -13,6 +14,7 @@ services:
- docker

before_install:
- apt-cache madison docker-engine
# upgrade docker-engine to specific version
- sudo apt-get -o Dpkg::Options::="--force-confnew" install -y docker-engine=${DOCKER_VERSION}
- sudo rm /usr/local/bin/docker-compose
Expand All @@ -24,11 +26,12 @@ install:
- make setup-ci

before_script:
- docker version
- docker-compose version
- make run-containers
- sleep 10

script:
- docker version
- docker-compose version
- make coverage
- $HOME/gopath/bin/goveralls -coverprofile coverage-all.out -service=travis-ci

Expand Down
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@ setup-ci:
@sudo add-apt-repository -y ppa:masterminds/glide && sudo apt-get update
@sudo apt-get install -y glide
@go get github.com/mattn/goveralls
@cd test_containers && docker-compose up -d && cd ..
@glide install

build:
@go build $(PACKAGES)
@go build

run-containers:
@cd test_containers && docker-compose up -d && cd ..

coverage:
@echo "mode: count" > coverage-all.out
@$(foreach pkg,$(PACKAGES),\
Expand Down

0 comments on commit 3a11f5e

Please sign in to comment.