Update .travis.yml (#30)

.travis.yml

@@ -5,7 +5,7 @@ addons:
     sources:
       - sourceline: 'deb https://dl.yarnpkg.com/debian/ stable main'
         key_url: 'https://dl.yarnpkg.com/debian/pubkey.gpg'
-      - sourceline: 'deb https://deb.nodesource.com/node_8.x trusty main'
+      - sourceline: 'deb https://deb.nodesource.com/node_10.x trusty main'
         key_url: 'https://deb.nodesource.com/gpgkey/nodesource.gpg.key'
     packages:
       - nodejs
@@ -13,41 +13,37 @@ addons:
       - build-essential
 env:
   global:
-    - GOV=1.9.2
-    - GOSHA="de874549d9a8d8d8062be05808509c09a88a248e77ec14eb77453530829ac02b  go${GOV}.linux-amd64.tar.gz"
+    - GOV=1.10.2
+    - GOSHA="4b677d698c65370afa33757b6954ade60347aaca310ea92a63ed717d7cb0c2ff  go${GOV}.linux-amd64.tar.gz"
     - 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=5.0.1
 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}/bin" "${GOROOT}" "${SRCROOT}/mattermost-"{server,webapp}
+  # download & extract golang
+  - 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"
+  # download & extract mattermost-server
+  - 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
+  # download & extract mattermost-webapp
+  - 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"
+  # workaround (instead of patch): platform binary is in GOOS_GOARCH, Makefile expects it in linux_amd64
+  - ln -s "${GOPATH}/bin/linux_arm" "${GOPATH}/bin/linux_amd64"
+  # adapt and revert reverted commit, https://github.com/mattermost/mattermost-server/pull/8537
+  - patch -d "${SRCROOT}/mattermost-server" -p1 < "${TRAVIS_BUILD_DIR}/build-release.patch"
+  # workaround (instead of patch): overwrite GO variable to enforce desired GOARCH
+  - make config-reset build-linux package-linux -C "${SRCROOT}/mattermost-server" GO="GOARCH=arm $(which go)" BUILD_NUMBER="dev-arm-tag${V}"
+  # workaround (instead of patch): Makefile creates *-amd64.tar.gz
+  - mv "${SRCROOT}/mattermost-server/dist/mattermost-team-linux-amd64.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

build-release.patch

@@ -0,0 +1,33 @@
+From 556e16211ed1b4c146ca2a094688618458182ae7 Mon Sep 17 00:00:00 2001
+From: Your Name <you@example.com>
+Date: Wed, 6 Jun 2018 12:34:56 +0100
+Subject: [PATCH] Split make goal
+
+---
+ build/release.mk | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/build/release.mk b/build/release.mk
+index 238343e..1b7859f 100644
+--- a/build/release.mk
++++ b/build/release.mk
+@@ -72,7 +72,7 @@ endif
+ 	cp README.md $(DIST_PATH)
+ 
+ 	@# ----- PLATFORM SPECIFIC -----
+-
++_:
+ 	@# Make osx package
+ 	@# Copy binary
+ ifeq ($(BUILDER_GOOS_GOARCH),"darwin_amd64")
+@@ -102,7 +102,7 @@ endif
+ 	@# Cleanup
+ 	rm -f $(DIST_PATH)/bin/mattermost.exe
+ 	rm -f $(DIST_PATH)/bin/platform.exe
+-
++package-linux: package
+ 	@# Make linux package
+ 	@# Copy binary
+ ifeq ($(BUILDER_GOOS_GOARCH),"linux_amd64")
+-- 
+2.11.0

make.patch

@@ -1,30 +0,0 @@
-diff --git a/build/release.mk b/build/release.mk
-index 5eaee80..e0e13bf 100644
---- a/build/release.mk
-+++ b/build/release.mk
-@@ -59,6 +59,7 @@ endif
- 	cp NOTICE.txt $(DIST_PATH)
- 	cp README.md $(DIST_PATH)
- 
-+_:
- 	@# ----- PLATFORM SPECIFIC -----
- 
- 	@# Make osx package
-@@ -85,14 +86,15 @@ endif
- 	@# Cleanup
- 	rm -f $(DIST_PATH)/bin/platform.exe
- 
-+package-linux: package
- 	@# Make linux package
- 	@# Copy binary
- ifeq ($(BUILDER_GOOS_GOARCH),"linux_amd64")
- 	cp $(GOPATH)/bin/platform $(DIST_PATH)/bin # from native bin dir, not cross-compiled
- else
--	cp $(GOPATH)/bin/linux_amd64/platform $(DIST_PATH)/bin # from cross-compiled bin dir
-+	cp $(GOPATH)/bin/linux_arm/platform $(DIST_PATH)/bin # from cross-compiled bin dir
- endif
- 	@# Package
--	tar -C dist -czf $(DIST_PATH)-$(BUILD_TYPE_NAME)-linux-amd64.tar.gz mattermost
-+	tar -C dist -czf $(DIST_PATH)-$(BUILD_TYPE_NAME)-linux-arm.tar.gz mattermost
- 	@# Don't clean up native package so dev machines will have an unzipped package available
- 	@#rm -f $(DIST_PATH)/bin/platform