Prep for CI build

pengwynn · Jan 17, 2014 · ed84064 · ed84064
1 parent 99fe669
commit ed84064
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 23 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,6 @@
-language: bash
+language: go
-script:
+go:
-  - bash script/test
+- 1.1.1
+install:
+- script/build
+script: script/test
diff --git a/bin/flint b/bin/flint
diff --git a/bin/gp-darwin-amd64 b/bin/gp-darwin-amd64
diff --git a/bin/gp-linux-amd64 b/bin/gp-linux-amd64
diff --git a/gopack.config b/gopack.config
@@ -1,3 +1,5 @@
+repo = "github.com/pengwynn/flint"
+
 [deps.assert]
 import = "github.com/bmizerany/assert"
 commit = "e17e99893cb6509f428e1728281c2ad60a6b31e3"

diff --git a/script/bootstrap b/script/bootstrap
@@ -1,7 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-set -e
+gopack="bin/gp-darwin-amd64"
+[ -d "/proc" ] && gopack="bin/gp-linux-amd64"
 
-echo "Reticulating splines..."
+$gopack version
-
-command -v flint >/dev/null 2>&1 || { echo >&2 "Consider adding flint to your \$PATH"; }
diff --git a/script/build b/script/build
@@ -1,5 +1,5 @@
-#!/bin/sh
+#!/bin/bash
 
-script/fmt
+script/bootstrap
-binary="bin/flint"
+GOPATH="`pwd`/.gopack/vendor" \
-go build -o $binary && echo "Built $binary"
+  go build -v ./...
diff --git a/script/fmt b/script/fmt
@@ -1,11 +1,4 @@
 #!/bin/bash
 
-gofmt -w -l "$@" *.go
+GOPATH="`pwd`/.gopack/vendor" \
-
+  go fmt ./...
-# don't run gofmt in these directories
-ignored=(/bin/ /docs/ /log/ /script/ /tmp/)
-for i in */ ; do
-  if [[ ! ${ignored[*]} =~ "/$i" ]]; then
-    gofmt -w -l "$@" "${i%?}"
-  fi
-done
diff --git a/script/test b/script/test
@@ -1,3 +1,5 @@
-#!/bin/sh
+#!/bin/bash
 
-go test -v ./flint_test.go
+script/fmt
+GOPATH="`pwd`/.gopack/vendor" \
+  go test -v ./...