Skip to content

Commit

Permalink
Convert .travis.yml to use "gimme" and update to Go 1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
tianon committed Feb 6, 2015
1 parent 286b582 commit bbabbab
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
14 changes: 6 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
language: go

# this should be exactly the same as what's in the Dockerfile
go: 1.3
go:
- 1.4.1
- 1.3.3

# let us have pretty experimental Docker-based Travis workers
sudo: false

env:
- _GOOS=linux _GOARCH=amd64
- _GOOS=darwin _GOARCH=amd64
- _GOOS=windows _GOARCH=amd64
- GIMME_OS=linux GIMME_ARCH=amd64
- GIMME_OS=darwin GIMME_ARCH=amd64
- GIMME_OS=windows GIMME_ARCH=amd64

install:
- env | sort
- gvm cross "$_GOOS" "$_GOARCH"
- export GOOS="$_GOOS" GOARCH="$_GOARCH"
- go env
- go get -d -v ./...

script:
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Dockerfile to cross compile boot2docker-cli

FROM golang:1.3-cross
FROM golang:1.4-cross

WORKDIR /go/src/github.com/boot2docker/boot2docker-cli

# Download (but not install) dependencies
RUN go get -v github.com/BurntSushi/toml
RUN go get -v github.com/ogier/pflag
RUN go get -v github.com/ogier/pflag

ADD . /go/src/github.com/boot2docker/boot2docker-cli

Expand Down

0 comments on commit bbabbab

Please sign in to comment.