From 58812fad4293db2edaee0fa04b2c5477bc6cc3f0 Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Sat, 15 Nov 2014 19:36:30 -0600 Subject: Reorg travis.yml --- .travis.yml | 10 ++++------ install_deps.sh | 8 ++++++++ travis.sh | 8 -------- 3 files changed, 12 insertions(+), 14 deletions(-) create mode 100755 install_deps.sh delete mode 100644 travis.sh diff --git a/.travis.yml b/.travis.yml index 25b44fc3a..c253f711e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,6 @@ +language: go +go: + - 1.3 before_install: - sudo add-apt-repository ppa:ubuntu-sdk-team/ppa -y - sudo apt-get update -qq @@ -7,9 +10,7 @@ install: - go get github.com/golang/lint/golint - go get code.google.com/p/go.tools/cmd/vet - go get code.google.com/p/go.tools/cmd/cover -language: go -go: - - 1.3 + - ./install_deps.sh after_script: # - gofmt -l -w . # - goimports -l -w . @@ -17,6 +18,3 @@ after_script: # - go vet ./... # - go test -race ./... - ./gocoverage.sh -script: - - chmod +x travis.sh - - ./travis.sh diff --git a/install_deps.sh b/install_deps.sh new file mode 100755 index 000000000..73a313324 --- /dev/null +++ b/install_deps.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +set -e + +TEST_DEPS=$(go list -f '{{.Imports}} {{.TestImports}} {{.XTestImports}}' github.com/ethereum/go-ethereum/... | sed -e 's/\[//g' | sed -e 's/\]//g' | sed -e 's/C //g') +if [ "$TEST_DEPS" ]; then + go get -race $TEST_DEPS +fi diff --git a/travis.sh b/travis.sh deleted file mode 100644 index 73a313324..000000000 --- a/travis.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -set -e - -TEST_DEPS=$(go list -f '{{.Imports}} {{.TestImports}} {{.XTestImports}}' github.com/ethereum/go-ethereum/... | sed -e 's/\[//g' | sed -e 's/\]//g' | sed -e 's/C //g') -if [ "$TEST_DEPS" ]; then - go get -race $TEST_DEPS -fi -- cgit v1.2.3