From eb7107a2fa5bf6d8faa579818a7063fbddd9b858 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Thu, 25 Jan 2018 15:32:05 -0800 Subject: [PATCH] use standard travis-ci scripts and enable sudo This should fix CI. Supersedes #34. --- .travis.yml | 13 +++++++++---- Makefile | 33 +++++++-------------------------- 2 files changed, 16 insertions(+), 30 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8db049c..e7b6fda 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,19 +1,24 @@ os: - linux +sudo: true + language: go -sudo: false - go: - - 1.7 + - 1.9.x install: - make deps script: - - make test + - bash <(curl -s https://raw.githubusercontent.com/ipfs/ci-helpers/master/travis-ci/run-standard-tests.sh) cache: directories: - $GOPATH/src/gx + +notifications: + email: false + +env: GOTFLAGS="-race" diff --git a/Makefile b/Makefile index 825b65d..5415256 100644 --- a/Makefile +++ b/Makefile @@ -1,28 +1,9 @@ -export PATH := bin:$(PATH) +export IPFS_API ?= v04x.ipfs.io -deps: gxbins - bin/gx install --global - bin/gx-go rewrite +gx: + go get -u github.com/whyrusleeping/gx + go get -u github.com/whyrusleeping/gx-go -publish: - bin/gx-go rewrite --undo - bin/gx publish - -test: deps - go test -race -cpu=5 -v ./... - -gxbins: bin/gx-v0.6.0 bin/gx-go-v1.2.0 - -bin/gx-v0.6.0: - mkdir -p bin - ./bin/dist_get gx bin/gx-v0.6.0 v0.6.0 - ln -s gx-v0.6.0 bin/gx - -bin/gx-go-v1.2.0: - mkdir -p bin - ./bin/dist_get gx-go bin/gx-go-v1.2.0 v1.2.0 - ln -s gx-go-v1.2.0 bin/gx-go - -clean: - rm -f bin/gx* - rm -rf bin/tmp +deps: gx + gx --verbose install --global + gx-go rewrite