version 5.19.1 (#71)

Bump github.com/mattermost/mattermost-server in /dependabot

Bumps [github.com/mattermost/mattermost-server](https://github.com/mattermost/mattermost-server) from 5.17.1 to 5.17.2.
- [Release notes](https://github.com/mattermost/mattermost-server/releases)
- [Changelog](https://github.com/mattermost/mattermost-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mattermost/mattermost-server/compare/v5.17.1...v5.17.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

.github/lock.yml

@@ -0,0 +1,7 @@
+# Configuration for Lock Threads - https://github.com/dessant/lock-threads
+
+# Number of days of inactivity before a closed issue or pull request is locked
+daysUntilLock: 3
+
+# Comment to post before locking. Set to `false` to disable
+lockComment: false

.travis.yml

@@ -1,57 +1,44 @@
 language: c
 dist: trusty
-addons:
-  apt:
-    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'
-        key_url: 'https://deb.nodesource.com/gpgkey/nodesource.gpg.key'
-    packages:
-      - nodejs
-      - yarn
-      - build-essential
+sudo: required
+service:
+  - docker
 env:
   global:
-    - GOV=1.9.2
-    - GOSHA="de874549d9a8d8d8062be05808509c09a88a248e77ec14eb77453530829ac02b  go${GOV}.linux-amd64.tar.gz"
-    - GOPATH=$HOME/go
-    - GOROOT=$HOME/$GOV/go
-    - PATH=$GOROOT/bin:$PATH:$GOPATH/bin
+    - DEBIAN_RELEASE='buster'
+    - DOCKER_PWD='/root'
+    - DOCKER_IMAGE="debian:${DEBIAN_RELEASE}"
   matrix:
-    - V=4.4.5
+    - GOOS='dragonfly' GOARCH='amd64'
+    - GOOS='freebsd' GOARCH='amd64'
+    - GOOS='freebsd' GOARCH='arm'
+    - GOOS='linux' GOARCH='arm'
+    - GOOS='linux' GOARCH='arm64'
+    - GOOS='linux' GOARCH='mips'
+    - GOOS='linux' GOARCH='mips64'
+    - GOOS='linux' GOARCH='mips64le'
+    - GOOS='linux' GOARCH='mipsle'
+    - GOOS='linux' GOARCH='ppc64'
+    - GOOS='linux' GOARCH='ppc64le'
+    - GOOS='linux' GOARCH='s390x'
+    - GOOS='netbsd' GOARCH='amd64'
+    - GOOS='netbsd' GOARCH='arm'
+    - GOOS='openbsd' GOARCH='amd64'
+    - GOOS='openbsd' GOARCH='arm'
 before_install:
-  - install -d $GOPATH $GOROOT
-  - wget https://storage.googleapis.com/golang/go$GOV.linux-amd64.tar.gz
-  - echo "${GOSHA}" > .gosha
-  - 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 ~/go/src/github.com/mattermost
-  - cd ~/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"
+  - export MATTERMOST_RELEASE="$(grep 'version' dependabot/Gopkg.toml | cut -d'"' -f2)"
+  - docker pull "${DOCKER_IMAGE}"
+  - chmod +x build.sh
 script:
-  - make build -C ~/go/src/github.com/mattermost/mattermost-webapp
-  - cd ~/go/src/github.com/mattermost/mattermost-server
-  - patch -p1 < $TRAVIS_BUILD_DIR/make.patch
-  - go get -d ./...
-  - make build-linux package BUILD_NUMBER="dev-arm-tag${V}"
-  - mv -v ~/go/src/github.com/mattermost/mattermost-server/dist/mattermost-*-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
+  - docker run --interactive=true --mount="type=bind,source=${PWD},destination=${DOCKER_PWD}" --rm=true --tty=true --workdir="${DOCKER_PWD}" -e DEBIAN_RELEASE -e MATTERMOST_RELEASE -e GOOS -e GOARCH "${DOCKER_IMAGE}" ./build.sh
+before_deploy:
+  - git config --local user.name 'Travis CI'
+  - git config --local user.email 'travis@travis-ci.org'
+  - git tag "${MATTERMOST_RELEASE}" || true
 deploy:
   provider: releases
   api_key: "${GITHUB_OAUTH_TOKEN}"
   file:
-    - "$TRAVIS_BUILD_DIR/mattermost-$V-arm.tar.gz"
-    - "$TRAVIS_BUILD_DIR/mattermost-$V-arm.tar.gz.sha512sum"
+    - "${TRAVIS_BUILD_DIR}/mattermost-${MATTERMOST_RELEASE}-${GOOS}-${GOARCH}.tar.gz"
+    - "${TRAVIS_BUILD_DIR}/mattermost-${MATTERMOST_RELEASE}-${GOOS}-${GOARCH}.tar.gz.sha512sum"
   skip_cleanup: true

README.md

@@ -1,10 +1,9 @@
-# ubiquitous-memory: [Here be dragons][3]
+# ubiquitous-memory: [Here be dragons][2]
 
 [![Build Status](https://travis-ci.org/SmartHoneybee/ubiquitous-memory.svg?branch=master)](https://travis-ci.org/SmartHoneybee/ubiquitous-memory)
 
-[Travis CI][0] recipe that builds [Mattermost][1] for Linux on [ARMv7][2]-compatible devices.
+[Travis CI][0] recipe that builds [Mattermost][1] for various operating systems and architectures.
 
 [0]: https://travis-ci.org/SmartHoneybee/ubiquitous-memory
 [1]: https://mattermost.com/
-[2]: https://github.com/golang/go/wiki/GoArm#supported-architectures
-[3]: https://en.wikipedia.org/wiki/Here_be_dragons
+[2]: https://en.wikipedia.org/wiki/Here_be_dragons

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
+@@ -70,7 +70,7 @@ endif
+ 	done
+ 
+ 	@# ----- PLATFORM SPECIFIC -----
+-
++_:
+ 	@# Make osx package
+ 	@# Copy binary
+ ifeq ($(BUILDER_GOOS_GOARCH),"darwin_amd64")
+@@ -110,7 +110,7 @@ endif
+ 	rm -f $(DIST_PATH)/bin/mattermost.exe
+ 	rm -f $(DIST_PATH)/bin/platform.exe
+ 	rm -f $(DIST_PATH)/prepackaged_plugins/*
+-
++package-linux: package
+ 	@# Make linux package
+ 	@# Copy binary
+ ifeq ($(BUILDER_GOOS_GOARCH),"linux_amd64")
+-- 
+2.11.0

build.sh

@@ -0,0 +1,111 @@
+#!/bin/sh
+set -eux
+# build user
+BUILD_USER_HOME="${BUILD_USER_HOME:-/build}"
+BUILD_USER_NAME="${BUILD_USER_NAME:-build}"
+# Debian release used during build
+DEBIAN_RELEASE="${DEBIAN_RELEASE:-stretch}"
+# Mattermost version to build
+MATTERMOST_RELEASE="${MATTERMOST_RELEASE:-v5.4.0}"
+# node key id and release
+NODE_KEY="${NODE_KEY:-9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280}"
+NODE_RELEASE="${NODE_RELEASE:-10}"
+
+if [ "$(id -u)" -eq 0 ]; then # as root user
+	# create build user, if needed
+	set +e
+	if ! id -u "${BUILD_USER_NAME}"; then # create build user
+		set -e
+		useradd --create-home --home-dir "${BUILD_USER_HOME}" --skel "${PWD}" \
+			"${BUILD_USER_NAME}"
+	fi
+	set -e
+	# configure apt
+	printf 'APT::Install-Recommends "0";' \
+		> '/etc/apt/apt.conf.d/99-no-install-recommends'
+	printf 'APT::Install-Suggests "0";' \
+		> '/etc/apt/apt.conf.d/99-no-install-suggests'
+	printf 'APT::Get::Assume-Yes "true";' \
+		> '/etc/apt/apt.conf.d/99-assume-yes'
+	# update repositories
+	apt-get update
+	# dependencies to setup repositories
+	apt-get install --quiet \
+		gnupg2 dirmngr apt-transport-https ca-certificates parallel
+	# receive missing key (retry on failure)
+	parallel --verbose --delay=30 --retries=5 "apt-key adv --keyserver 'ipv4.pool.sks-keyservers.net' --recv-keys '{}'" ::: "${NODE_KEY}"
+	# add required additional repositories
+	printf 'deb-src http://deb.debian.org/debian %s main\n' "${DEBIAN_RELEASE}" 'testing' \
+		> "/etc/apt/sources.list.d/source.list"
+	printf 'deb https://deb.nodesource.com/node_%s.x %s main' "${NODE_RELEASE}" "${DEBIAN_RELEASE}" \
+		> '/etc/apt/sources.list.d/nodesource.list'
+	# update repositories
+	apt-get update
+	# install go from testing sources; FIXME use backports https://bugs.debian.org/943399
+	_gov="1.13"
+	export DEB_BUILD_OPTIONS="nocheck nodoc parallel=$(nproc) terse"
+	apt-get build-dep "golang-${_gov}-go/testing"
+	apt-get source --compile "golang-${_gov}-go/testing"
+	apt-get install --quiet \
+		"${PWD}/golang-${_gov}"*".deb"
+	ln --symbolic --force  "/usr/lib/go-${_gov}/bin/go" /usr/bin/go # FIXME ugly
+	# install dependencies
+	apt-get install --quiet \
+		wget build-essential patch git nodejs
+	# install 'pngquant' build dependencies (required by node module)
+	apt-get build-dep --quiet \
+		pngquant
+	# FIXME go (executed by build user) writes to GOROOT
+	install --directory --owner="${BUILD_USER_NAME}" \
+		"$(go env GOROOT)/pkg/$(go env GOOS)_$(go env GOARCH)"
+	# switch to build user
+	runuser -u "${BUILD_USER_NAME}" -- "${0}"
+	# salvage build artifacts
+	cp --verbose \
+		"${BUILD_USER_HOME}/mattermost-${MATTERMOST_RELEASE}-$(go env GOOS)-$(go env GOARCH).tar.gz" \
+		"${BUILD_USER_HOME}/mattermost-${MATTERMOST_RELEASE}-$(go env GOOS)-$(go env GOARCH).tar.gz.sha512sum" \
+		"${HOME}"
+	exit 0
+fi
+# as non-root user
+cd "${HOME}"
+# download and extract Mattermost sources
+for COMPONENT in server webapp; do
+	install --directory "${HOME}/go/src/github.com/mattermost/mattermost-${COMPONENT}"
+	wget --quiet --continue --output-document="mattermost-${COMPONENT}.tar.gz" \
+		"https://github.com/mattermost/mattermost-${COMPONENT}/archive/${MATTERMOST_RELEASE}.tar.gz"
+	tar --directory="${HOME}/go/src/github.com/mattermost/mattermost-${COMPONENT}" \
+		--strip-components=1 --extract --file="mattermost-${COMPONENT}.tar.gz"
+done
+# build Mattermost webapp
+npm set progress false
+sed -i -e 's#--verbose#--display minimal#' \
+	"${HOME}/go/src/github.com/mattermost/mattermost-webapp/package.json"
+make --directory="${HOME}/go/src/github.com/mattermost/mattermost-webapp" \
+	build
+# build Mattermost server
+install --directory "${HOME}/go/bin"
+if [ "$(go env GOOS)_$(go env GOARCH)" != 'linux_amd64' ]; then
+	ln --symbolic \
+		"${HOME}/go/bin/$(go env GOOS)_$(go env GOARCH)" \
+		"${HOME}/go/bin/linux_amd64"
+fi
+patch --directory="${HOME}/go/src/github.com/mattermost/mattermost-server" \
+	--strip=1 < "${HOME}/build-release.patch"
+sed -i \
+	-e 's#go generate#env --unset=GOOS --unset=GOARCH go generate#' \
+	-e 's#$(GO) generate#env --unset=GOOS --unset=GOARCH go generate#' \
+	-e 's#PWD#CURDIR#' \
+	"${HOME}/go/src/github.com/mattermost/mattermost-server/Makefile" \
+	"${HOME}/go/src/github.com/mattermost/mattermost-server/build/release.mk"
+sed -i -e '107d' "${HOME}/go/src/github.com/mattermost/mattermost-server/go.mod" # invalid pseudo-version: does not match version-control timestamp
+make --directory="${HOME}/go/src/github.com/mattermost/mattermost-server" \
+	config-reset build-linux package-linux \
+	BUILD_NUMBER="dev-$(go env GOOS)-$(go env GOARCH)-${MATTERMOST_RELEASE}" \
+	GO="GOARCH=$(go env GOARCH) GOOS=$(go env GOOS) $(command -v go)" \
+	PLUGIN_PACKAGES=''
+# rename archive and calculate its SHA512 sum
+mv "${HOME}/go/src/github.com/mattermost/mattermost-server/dist/mattermost-team-linux-amd64.tar.gz" \
+	"${HOME}/mattermost-${MATTERMOST_RELEASE}-$(go env GOOS)-$(go env GOARCH).tar.gz"
+sha512sum "${HOME}/mattermost-${MATTERMOST_RELEASE}-$(go env GOOS)-$(go env GOARCH).tar.gz" | \
+	tee "${HOME}/mattermost-${MATTERMOST_RELEASE}-$(go env GOOS)-$(go env GOARCH).tar.gz.sha512sum"

dependabot/Gopkg.lock

@@ -0,0 +1,197 @@
+# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
+
+
+[[projects]]
+  digest = "1:79421244ba5848aae4b0a5c41e633a04e4894cb0b164a219dc8c15ec7facb7f1"
+  name = "github.com/blang/semver"
+  packages = ["."]
+  pruneopts = ""
+  revision = "2ee87856327ba09384cabd113bc6b5d174e9ec0f"
+  version = "v3.5.1"
+
+[[projects]]
+  branch = "master"
+  digest = "1:b89d54b3534c2a85153cc60a39e1a9764f9cc6c7b3d1b31265fd53cd70ea77dd"
+  name = "github.com/dyatlov/go-opengraph"
+  packages = ["opengraph"]
+  pruneopts = ""
+  revision = "816b6608b3c8c1e871bc9cf777f390e2532081fe"
+
+[[projects]]
+  digest = "1:5247b135b5492aa232a731acdcb52b08f32b874cb398f21ab460396eadbe866b"
+  name = "github.com/google/uuid"
+  packages = ["."]
+  pruneopts = ""
+  revision = "d460ce9f8df2e77fb1ba55ca87fafed96c607494"
+  version = "v1.0.0"
+
+[[projects]]
+  branch = "master"
+  digest = "1:ad21af51a0276292e9f6f5c37b966630138986478b1ecdbb94b907168fe25281"
+  name = "github.com/gorilla/websocket"
+  packages = ["."]
+  pruneopts = ""
+  revision = "483fb8d7c32fcb4b5636cd293a92e3935932e2f4"
+
+[[projects]]
+  digest = "1:9fa4a4a684dfb36f3ba1b0a163225140e19e3219e5576d0761d02dbd4c31b743"
+  name = "github.com/mattermost/go-i18n"
+  packages = ["i18n"]
+  pruneopts = ""
+  revision = "0dc1626d56435e9d605a29875701721c54bc9bbd"
+  version = "v1.10.0"
+
+[[projects]]
+  digest = "1:e2df3d086086eadfe8ef94d8f1f333d75b5332987b4c6116f5df8d6bf2a69417"
+  name = "github.com/mattermost/ldap"
+  packages = ["."]
+  pruneopts = ""
+  revision = "fee0a369f21be68ea3d647c0da8272a352fa1528"
+  version = "v3.0.4"
+
+[[projects]]
+  digest = "1:75c32be0ba2d885c98345eba1d8e74b7c04cb74b9672c27849e71800f18090ee"
+  name = "github.com/mattermost/mattermost-server"
+  packages = [
+    "mlog",
+    "model",
+    "services/timezones",
+    "utils/jsonutils",
+    "utils/markdown",
+  ]
+  pruneopts = ""
+  revision = "35ea48a071f2837d30217cefb2de7d7855fe7f77"
+  version = "v5.17.3"
+
+[[projects]]
+  digest = "1:9fa4a4a684dfb36f3ba1b0a163225140e19e3219e5576d0761d02dbd4c31b743"
+  name = "github.com/nicksnyder/go-i18n"
+  packages = [
+    "i18n/bundle",
+    "i18n/language",
+    "i18n/translation",
+  ]
+  pruneopts = ""
+  revision = "0dc1626d56435e9d605a29875701721c54bc9bbd"
+  version = "v1.10.0"
+
+[[projects]]
+  digest = "1:a5484d4fa43127138ae6e7b2299a6a52ae006c7f803d98d717f60abf3e97192e"
+  name = "github.com/pborman/uuid"
+  packages = ["."]
+  pruneopts = ""
+  revision = "adf5a7427709b9deb95d29d3fa8a2bf9cfd388f1"
+  version = "v1.2"
+
+[[projects]]
+  digest = "1:894aef961c056b6d85d12bac890bf60c44e99b46292888bfa66caf529f804457"
+  name = "github.com/pelletier/go-toml"
+  packages = ["."]
+  pruneopts = ""
+  revision = "c01d1270ff3e442a8a57cddc1c92dc1138598194"
+  version = "v1.2.0"
+
+[[projects]]
+  digest = "1:7365acd48986e205ccb8652cc746f09c8b7876030d53710ea6ef7d0bd0dcd7ca"
+  name = "github.com/pkg/errors"
+  packages = ["."]
+  pruneopts = ""
+  revision = "645ef00459ed84a119197bfb8d8205042c6df63d"
+  version = "v0.8.0"
+
+[[projects]]
+  digest = "1:74f86c458e82e1c4efbab95233e0cf51b7cc02dc03193be9f62cd81224e10401"
+  name = "go.uber.org/atomic"
+  packages = ["."]
+  pruneopts = ""
+  revision = "1ea20fb1cbb1cc08cbd0d913a96dead89aa18289"
+  version = "v1.3.2"
+
+[[projects]]
+  digest = "1:22c7effcb4da0eacb2bb1940ee173fac010e9ef3c691f5de4b524d538bd980f5"
+  name = "go.uber.org/multierr"
+  packages = ["."]
+  pruneopts = ""
+  revision = "3c4937480c32f4c13a875a1829af76c98ca3d40a"
+  version = "v1.1.0"
+
+[[projects]]
+  digest = "1:246f378f80fba6fcf0f191c486b6613265abd2bc0f2fa55a36b928c67352021e"
+  name = "go.uber.org/zap"
+  packages = [
+    ".",
+    "buffer",
+    "internal/bufferpool",
+    "internal/color",
+    "internal/exit",
+    "zapcore",
+  ]
+  pruneopts = ""
+  revision = "ff33455a0e382e8a81d14dd7c922020b6b5e7982"
+  version = "v1.9.1"
+
+[[projects]]
+  branch = "master"
+  digest = "1:efb97ebbd73c3a7068579327f5d98a17c09f6d8caf1fa3212c506e8bb78126b5"
+  name = "golang.org/x/crypto"
+  packages = [
+    "bcrypt",
+    "blowfish",
+  ]
+  pruneopts = ""
+  revision = "4d3f4d9ffa16a13f451c3b2999e9c49e9750bf06"
+
+[[projects]]
+  branch = "master"
+  digest = "1:4f7cbb08d72e1163302e2d21415200a7bc281653f5f34eda8a15c0da11a337b0"
+  name = "golang.org/x/net"
+  packages = [
+    "html",
+    "html/atom",
+  ]
+  pruneopts = ""
+  revision = "3a22650c66bd7f4fb6d1e8072ffd7b75c8a27898"
+
+[[projects]]
+  digest = "1:5acd3512b047305d49e8763eef7ba423901e85d5dd2fd1e71778a0ea8de10bd4"
+  name = "golang.org/x/text"
+  packages = [
+    "internal/gen",
+    "internal/tag",
+    "language",
+    "unicode/cldr",
+  ]
+  pruneopts = ""
+  revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"
+  version = "v0.3.0"
+
+[[projects]]
+  digest = "1:039b95e6ba078fe5a22315dcae7bc9859226ee34672ce9ab01708576bf2abd38"
+  name = "gopkg.in/asn1-ber.v1"
+  packages = ["."]
+  pruneopts = ""
+  revision = "f715ec2f112d1e4195b827ad68cf44017a3ef2b1"
+  version = "v1.3"
+
+[[projects]]
+  digest = "1:11c58e19ff7ce22740423bb933f1ddca3bf575def40d5ac3437ec12871b1648b"
+  name = "gopkg.in/natefinch/lumberjack.v2"
+  packages = ["."]
+  pruneopts = ""
+  revision = "a96e63847dc3c67d17befa69c303767e2f84e54f"
+  version = "v2.1"
+
+[[projects]]
+  digest = "1:f0620375dd1f6251d9973b5f2596228cc8042e887cd7f827e4220bc1ce8c30e2"
+  name = "gopkg.in/yaml.v2"
+  packages = ["."]
+  pruneopts = ""
+  revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183"
+  version = "v2.2.1"
+
+[solve-meta]
+  analyzer-name = "dep"
+  analyzer-version = 1
+  input-imports = ["github.com/mattermost/mattermost-server/model"]
+  solver-name = "gps-cdcl"
+  solver-version = 1

dependabot/Gopkg.toml

@@ -0,0 +1,3 @@
+[[constraint]]
+  name = "github.com/mattermost/mattermost-server"
+  version = "v5.19.1"

dependabot/dummy.go

@@ -0,0 +1,3 @@
+package main
+import _ "github.com/mattermost/mattermost-server/model"
+func() main() {/* dummy file */}

make.patch

@@ -1,63 +0,0 @@
-diff --git a/build/release.mk b/build/release.mk
-index 5eaee80..e0e13bf 100644
---- a/build/release.mk
-+++ b/build/release.mk
-@@ -3,7 +3,7 @@ dist: | check-style test package
- 
- build-linux:
- 	@echo Build Linux amd64
--	env GOOS=linux GOARCH=amd64 $(GO) install $(GOFLAGS) $(GO_LINKER_FLAGS) ./cmd/platform
-+	env GOOS=linux GOARCH=arm GOARM=7 $(GO) install $(GOFLAGS) $(GO_LINKER_FLAGS) ./cmd/platform
- 
- build-osx: 
- 	@echo Build OSX amd64
-@@ -32,6 +32,7 @@ package:
- 
- 	@# Resource directories
- 	cp -RL config $(DIST_PATH)
-+	mv $(DIST_PATH)/config/default.json $(DIST_PATH)/config/config.json
- 	cp -RL fonts $(DIST_PATH)
- 	cp -RL templates $(DIST_PATH)
- 	cp -RL i18n $(DIST_PATH)
-@@ -61,38 +62,14 @@ endif
- 
- 	@# ----- PLATFORM SPECIFIC -----
- 
--	@# Make osx package
--	@# Copy binary
--ifeq ($(BUILDER_GOOS_GOARCH),"darwin_amd64")
--	cp $(GOPATH)/bin/platform $(DIST_PATH)/bin # from native bin dir, not cross-compiled
--else
--	cp $(GOPATH)/bin/darwin_amd64/platform $(DIST_PATH)/bin # from cross-compiled bin dir
--endif
--	@# Package
--	tar -C dist -czf $(DIST_PATH)-$(BUILD_TYPE_NAME)-osx-amd64.tar.gz mattermost
--	@# Cleanup
--	rm -f $(DIST_PATH)/bin/platform
--
--	@# Make windows package
--	@# Copy binary
--ifeq ($(BUILDER_GOOS_GOARCH),"windows_amd64")
--	cp $(GOPATH)/bin/platform.exe $(DIST_PATH)/bin # from native bin dir, not cross-compiled
--else
--	cp $(GOPATH)/bin/windows_amd64/platform.exe $(DIST_PATH)/bin # from cross-compiled bin dir
--endif
--	@# Package
--	cd $(DIST_ROOT) && zip -9 -r -q -l mattermost-$(BUILD_TYPE_NAME)-windows-amd64.zip mattermost && cd ..
--	@# Cleanup
--	rm -f $(DIST_PATH)/bin/platform.exe
--
- 	@# Make linux package
- 	@# Copy binary
--ifeq ($(BUILDER_GOOS_GOARCH),"linux_amd64")
-+ifeq ($(BUILDER_GOOS_GOARCH),"linux_arm")
- 	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