Update .travis.yml (#24)

.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_9.x trusty main'
         key_url: 'https://deb.nodesource.com/gpgkey/nodesource.gpg.key'
     packages:
       - nodejs
@@ -13,31 +13,42 @@ addons:
       - build-essential
 env:
   global:
-    - GOV=1.9.2
-    - GOSHA="de874549d9a8d8d8062be05808509c09a88a248e77ec14eb77453530829ac02b  go${GOV}.linux-amd64.tar.gz"
+    - GOV=1.10
+    - GOSHA="b5a64335f1490277b585832d1f6c7f8c6c11206cba5cd3f771dcb87b98ad1a33  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.7.0
+    - V=4.9.0
 before_install:
   - install -d "${GOPATH}" "${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"
+  # set maximum number of open file descriptors
   - ulimit -n 8096
+  # 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 "${SRCROOT}/mattermost-webapp"
-  - patch -d "${SRCROOT}/mattermost-server" -p1 < "${TRAVIS_BUILD_DIR}/make.patch"
+  # workaround (instead of patch): platform binary is in GOOS_GOARCH, Makefile expects it in linux_amd64
+  - install -d "${GOPATH}/bin/linux_amd64"
+  - ln -s "${GOPATH}/bin/linux_arm/platform" "${GOPATH}/bin/linux_amd64/platform"
+  # install dependencies
   - go get -d github.com/mattermost/mattermost-server/...
+  # revert reverted commit, https://github.com/mattermost/mattermost-server/pull/8537
+  - wget -qO - https://patch-diff.githubusercontent.com/raw/mattermost/mattermost-server/pull/8537.patch | patch -d "${SRCROOT}/mattermost-server" -Rp1
+  # 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}"
-  - mv "${SRCROOT}/mattermost-server/dist/mattermost-team-linux-arm.tar.gz" "${TRAVIS_BUILD_DIR}/mattermost-${V}-arm.tar.gz"
+  # 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

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