From 4ae03d3ee71d8043f412019380403fbb4f888cf0 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Wed, 22 Jul 2015 11:26:41 -0800 Subject: adding godep restore to travis --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 8793ba98a..49c0cfefb 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,8 @@ all: travis travis: @echo building for travis + godep restore + rm -Rf $(DIST_ROOT) @go clean $(GOFLAGS) -i ./... -- cgit v1.2.3-1-g7c22 From 63bea7e087f1d1fb371c8344894f86fc3f8104db Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Wed, 22 Jul 2015 11:30:47 -0800 Subject: Fixing godep restore --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 49c0cfefb..139247715 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ all: travis travis: @echo building for travis - godep restore + ${TRAVIS_BUILD_DIR}/Godeps/_workspace/bin/godep restore rm -Rf $(DIST_ROOT) @go clean $(GOFLAGS) -i ./... -- cgit v1.2.3-1-g7c22 From dc5a2550dd9a2189fbd282d9848d12e65bbabedc Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Wed, 22 Jul 2015 11:35:11 -0800 Subject: Fixing godep restore --- .travis.yml | 5 +++++ Makefile | 2 -- 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 ./... -- cgit v1.2.3-1-g7c22