From 64b4df143ad2b55eb9ec924b303eb5b2b5aa0ac6 Mon Sep 17 00:00:00 2001
From: Bee <SmartHoneybee@users.noreply.github.com>
Date: Tue, 16 Jan 2018 08:24:29 +0100
Subject: [PATCH] Update .travis.yml (#17)

---
 .travis.yml | 38 ++++++++++++++------------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b0d2671..98bb01c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,36 +18,26 @@ env:
     - GOPATH="${HOME}/go"
     - GOROOT="${HOME}/${GOV}/go"
     - PATH="${GOROOT}/bin:${PATH}:${GOPATH}/bin"
+    - SRCROOT="${GOPATH}/src/github.com/mattermost"
     - GOARM=7
   matrix:
-    - V=4.5.1
+    - V=4.6.0
 before_install:
-  - install -d "${GOPATH}" "${GOROOT}"
-  - wget "https://storage.googleapis.com/golang/go${GOV}.linux-amd64.tar.gz"
-  - echo "${GOSHA}" > .gosha
-  - sha256sum --check .gosha
+  - install -d "${GOPATH}" "${GOROOT}" "${SRCROOT}/mattermost-"{server,webapp}
+  - wget -q "https://storage.googleapis.com/golang/go${GOV}.linux-amd64.tar.gz"
+  - sha256sum --check <<< "${GOSHA}"
   - tar -C "${HOME}/${GOV}" -xzf "go${GOV}.linux-amd64.tar.gz"
-  - node --version
-  - yarn versions
-  - go version
   - ulimit -n 8096
-  - install -d "${HOME}/go/src/github.com/mattermost"
-  - cd "${HOME}/go/src/github.com/mattermost"
-  - wget "https://github.com/mattermost/mattermost-server/archive/v${V}.tar.gz"
-  - tar xf "v${V}.tar.gz"
-  - mv "mattermost-server-${V}" mattermost-server
-  - rm "v${V}.tar.gz"
-  - wget "https://github.com/mattermost/mattermost-webapp/archive/v${V}.tar.gz"
-  - tar xf "v${V}.tar.gz"
-  - mv "mattermost-webapp-${V}" mattermost-webapp
-  - rm "v${V}.tar.gz"
+  - wget -q "https://github.com/mattermost/mattermost-server/archive/v${V}.tar.gz" -O mattermost-server.tar.gz
+  - tar -C "${SRCROOT}/mattermost-server" --strip-components=1 -xf mattermost-server.tar.gz
+  - wget -q "https://github.com/mattermost/mattermost-webapp/archive/v${V}.tar.gz" -O mattermost-webapp.tar.gz
+  - tar -C "${SRCROOT}/mattermost-webapp" --strip-components=1 -xf mattermost-webapp.tar.gz
 script:
-  - make build -C "${HOME}/go/src/github.com/mattermost/mattermost-webapp"
-  - cd "${HOME}/go/src/github.com/mattermost/mattermost-server"
-  - patch -p1 < "${TRAVIS_BUILD_DIR}/make.patch"
-  - go get -d ./...
-  - make config-reset build-linux package-linux GO="GOARCH=arm $(which go)" BUILD_NUMBER="dev-arm-tag${V}"
-  - mv dist/mattermost-team-linux-arm.tar.gz "${TRAVIS_BUILD_DIR}/mattermost-${V}-arm.tar.gz"
+  - make build -C "${SRCROOT}/mattermost-webapp"
+  - patch -d "${SRCROOT}/mattermost-server" -p1 < "${TRAVIS_BUILD_DIR}/make.patch"
+  - go get -d github.com/mattermost/mattermost-server/...
+  - make config-reset build-linux package-linux -C "${SRCROOT}/mattermost-server" GO="GOARCH=arm $(which go)" BUILD_NUMBER="dev-arm-tag${V}"
+  - mv "${SRCROOT}/mattermost-server/dist/mattermost-team-linux-arm.tar.gz" "${TRAVIS_BUILD_DIR}/mattermost-${V}-arm.tar.gz"
   - sha512sum "${TRAVIS_BUILD_DIR}/mattermost-${V}-arm.tar.gz" | tee "${TRAVIS_BUILD_DIR}/mattermost-${V}-arm.tar.gz.sha512sum"
 deploy:
   provider: releases