summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Martín Nieto <[email protected]>2014-06-07 03:00:29 +0200
committerCarlos Martín Nieto <[email protected]>2014-06-07 03:27:00 +0200
commit3da96c3dd775f2242797a53b04a65919a15899e4 (patch)
tree8826606309541c705c57742eae2353bb9fff892e
parentc734fc2a6b015f5b38f30da106736877cfbe02c7 (diff)
Adjust travis script to static
-rw-r--r--.travis.yml5
-rw-r--r--Makefile2
2 files changed, 2 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 5bc4f9f..6e480f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,11 +6,6 @@ go:
- 1.2
- tip
-install:
- - script/build-libgit2.sh
- - export PKG_CONFIG_PATH=$PWD/libgit2/install/lib/pkgconfig
- - export LD_LIBRARY_PATH=$PWD/libgit2/install/lib
-
matrix:
allow_failures:
- go: tip
diff --git a/Makefile b/Makefile
index 4ecc8a4..b306577 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,8 @@ default: test
build-libgit2:
./script/build-libgit2-static.sh
+ cat ./vendor/libgit2/libgit2.pc
+ cat ./vendor/install/lib/pkgconfig/libgit2.pc
test: build-libgit2
./script/with-static.sh go test ./...