summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-07-22 11:35:11 -0800
committer=Corey Hulen <corey@hulen.com>2015-07-22 11:35:11 -0800
commitdc5a2550dd9a2189fbd282d9848d12e65bbabedc (patch)
treed264ac628a274b6f67614a226d5d128abe8c1808
parent63bea7e087f1d1fb371c8344894f86fc3f8104db (diff)
downloadchat-dc5a2550dd9a2189fbd282d9848d12e65bbabedc.tar.gz
chat-dc5a2550dd9a2189fbd282d9848d12e65bbabedc.tar.bz2
chat-dc5a2550dd9a2189fbd282d9848d12e65bbabedc.zip
Fixing godep restore
-rw-r--r--.travis.yml5
-rw-r--r--Makefile2
2 files changed, 5 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 55ab2986e..fc2fb7646 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,11 @@ before_install:
- "sudo sed -i'' 's/basedir[^=]\\+=.*$/basedir = \\/opt\\/mysql\\/server-5.6/' /etc/mysql/my.cnf"
- "sudo /etc/init.d/mysql.server start"
+install:
+ - export PATH=$PATH:$HOME/gopath/bin
+ - go get github.com/tools/godep
+ - godep restore
+
before_script:
- mysql -e "CREATE DATABASE IF NOT EXISTS mattermost_test ;" -uroot
- mysql -e "CREATE USER 'mmuser'@'%' IDENTIFIED BY 'mostest' ;" -uroot
diff --git a/Makefile b/Makefile
index 139247715..8793ba98a 100644
--- a/Makefile
+++ b/Makefile
@@ -20,8 +20,6 @@ all: travis
travis:
@echo building for travis
- ${TRAVIS_BUILD_DIR}/Godeps/_workspace/bin/godep restore
-
rm -Rf $(DIST_ROOT)
@go clean $(GOFLAGS) -i ./...