Skip to content

Commit 6040dff

Browse files
authored
Merge pull request #35 from multiformats/fix/travis
use standard travis-ci scripts and enable sudo
2 parents 28713be + eb7107a commit 6040dff

File tree

2 files changed

+16
-30
lines changed

2 files changed

+16
-30
lines changed

.travis.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,24 @@
11
os:
22
- linux
33

4-
language: go
4+
sudo: true
55

6-
sudo: false
6+
language: go
77

88
go:
9-
- 1.7
9+
- 1.9.x
1010

1111
install:
1212
- make deps
1313

1414
script:
15-
- make test
15+
- bash <(curl -s https://raw.githubusercontent.com/ipfs/ci-helpers/master/travis-ci/run-standard-tests.sh)
1616

1717
cache:
1818
directories:
1919
- $GOPATH/src/gx
20+
21+
notifications:
22+
email: false
23+
24+
env: GOTFLAGS="-race"

Makefile

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,9 @@
1-
export PATH := bin:$(PATH)
1+
export IPFS_API ?= v04x.ipfs.io
22

3-
deps: gxbins
4-
bin/gx install --global
5-
bin/gx-go rewrite
3+
gx:
4+
go get -u github.com/whyrusleeping/gx
5+
go get -u github.com/whyrusleeping/gx-go
66

7-
publish:
8-
bin/gx-go rewrite --undo
9-
bin/gx publish
10-
11-
test: deps
12-
go test -race -cpu=5 -v ./...
13-
14-
gxbins: bin/gx-v0.6.0 bin/gx-go-v1.2.0
15-
16-
bin/gx-v0.6.0:
17-
mkdir -p bin
18-
./bin/dist_get gx bin/gx-v0.6.0 v0.6.0
19-
ln -s gx-v0.6.0 bin/gx
20-
21-
bin/gx-go-v1.2.0:
22-
mkdir -p bin
23-
./bin/dist_get gx-go bin/gx-go-v1.2.0 v1.2.0
24-
ln -s gx-go-v1.2.0 bin/gx-go
25-
26-
clean:
27-
rm -f bin/gx*
28-
rm -rf bin/tmp
7+
deps: gx
8+
gx --verbose install --global
9+
gx-go rewrite

0 commit comments

Comments
 (0)