Update to Mattermost 5.31.0 (#100)

* Mattermost 5.30.0 release

* Update to 5.30.1 due to Mattermost release bug

.github/workflows/lock.yml

@@ -0,0 +1,15 @@
+name: 'Lock threads'
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  lock:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/lock-threads@v2
+        with:
+          github-token: ${{ github.token }}
+          issue-lock-inactive-days: 3
+          pr-lock-inactive-days: 3

.travis.yml

@@ -1,11 +1,11 @@
 language: c
-dist: trusty
-sudo: required
-service:
+os: linux
+dist: bionic
+services:
   - docker
 env:
   global:
-    - DEBIAN_RELEASE='stretch'
+    - DEBIAN_RELEASE='buster'
     - DOCKER_PWD='/root'
     - DOCKER_IMAGE="debian:${DEBIAN_RELEASE}"
   matrix:
@@ -26,7 +26,7 @@ env:
     - GOOS='openbsd' GOARCH='amd64'
     - GOOS='openbsd' GOARCH='arm'
 before_install:
-  - export MATTERMOST_RELEASE="$(grep 'version' dependabot/Gopkg.toml | cut -d'"' -f2)"
+  - export MATTERMOST_RELEASE="$(grep 'mattermost' dependabot/go.mod | cut -d' ' -f3)"
   - docker pull "${DOCKER_IMAGE}"
   - chmod +x build.sh
 script:

build-release.patch

@@ -1,18 +1,18 @@
-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
+index 3e9a11339..c8bd5409f 100644
 --- a/build/release.mk
 +++ b/build/release.mk
-@@ -61,7 +61,7 @@ endif
- 	cp README.md $(DIST_PATH)
+@@ -97,7 +97,7 @@ package:
+ 	cp -RL $(BUILD_WEBAPP_DIR)/dist/* $(DIST_PATH)/client
+ 
+ 	@#Download MMCTL
+-	scripts/download_mmctl_release.sh "" $(DIST_PATH)/bin
++	#scripts/download_mmctl_release.sh "" $(DIST_PATH)/bin
+ 
+ 	@# Help files
+ ifeq ($(BUILD_ENTERPRISE_READY),true)
+@@ -126,7 +126,7 @@ endif
+ 
  
  	@# ----- PLATFORM SPECIFIC -----
 -
@@ -20,14 +20,21 @@ index 238343e..1b7859f 100644
  	@# Make osx package
  	@# Copy binary
  ifeq ($(BUILDER_GOOS_GOARCH),"darwin_amd64")
-@@ -106,7 +106,7 @@ endif
- 	rm -f $(DIST_PATH)/bin/mattermost.exe
+@@ -196,7 +196,7 @@ endif
  	rm -f $(DIST_PATH)/bin/platform.exe
+ 	rm -f $(DIST_PATH)/bin/mmctl.exe
  	rm -f $(DIST_PATH)/prepackaged_plugins/*
 -
 +package-linux: package
  	@# Make linux package
  	@# Copy binary
  ifeq ($(BUILDER_GOOS_GOARCH),"linux_amd64")
--- 
-2.11.0
+@@ -207,7 +207,7 @@ else
+ 	cp $(GOBIN)/linux_amd64/platform $(DIST_PATH)/bin # from cross-compiled bin dir
+ endif
+ 	#Download MMCTL for Linux
+-	scripts/download_mmctl_release.sh "Linux" $(DIST_PATH)/bin
++	#scripts/download_mmctl_release.sh "Linux" $(DIST_PATH)/bin
+ 	@# Prepackage plugins
+ 	@for plugin_package in $(PLUGIN_PACKAGES) ; do \
+ 		ARCH="linux-amd64"; \

build.sh

@@ -31,9 +31,9 @@ if [ "$(id -u)" -eq 0 ]; then # as root user
 	apt-get update
 	# dependencies to setup repositories
 	apt-get install --quiet \
-		gnupg2 dirmngr apt-transport-https ca-certificates
-	# receive missing key
-	apt-key adv --keyserver 'ipv4.pool.sks-keyservers.net' --recv-keys "${NODE_KEY}"
+		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' "${DEBIAN_RELEASE}" \
 		> "/etc/apt/sources.list.d/${DEBIAN_RELEASE}-source.list"
@@ -66,8 +66,6 @@ if [ "$(id -u)" -eq 0 ]; then # as root user
 fi
 # as non-root user
 cd "${HOME}"
-# install yarn
-npm install yarn
 # download and extract Mattermost sources
 for COMPONENT in server webapp; do
 	install --directory "${HOME}/go/src/github.com/mattermost/mattermost-${COMPONENT}"
@@ -77,6 +75,9 @@ for COMPONENT in server webapp; do
 		--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
@@ -87,7 +88,13 @@ if [ "$(go env GOOS)_$(go env GOARCH)" != 'linux_amd64' ]; then
 		"${HOME}/go/bin/linux_amd64"
 fi
 patch --directory="${HOME}/go/src/github.com/mattermost/mattermost-server" \
-	--strip=1 < "${HOME}/build-release.patch"
+	--strip=1 -t < "${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"
 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}" \

dependabot/Gopkg.lock

@@ -1,133 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[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:48a3138a87e866b217088fc5777fabc71c6c71fb63d4e42ef97e5717735f2b5d"
-  name = "github.com/mattermost/mattermost-server"
-  packages = [
-    "mlog",
-    "model",
-    "utils/jsonutils",
-    "utils/markdown",
-  ]
-  pruneopts = ""
-  revision = "826252252404c13bf564a8c4fd51616fc2cc4df9"
-  version = "v5.5.0"
-
-[[projects]]
-  digest = "1:9fa4a4a684dfb36f3ba1b0a163225140e19e3219e5576d0761d02dbd4c31b743"
-  name = "github.com/nicksnyder/go-i18n"
-  packages = [
-    "i18n",
-    "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]]
-  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

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

dependabot/dummy.go

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

dependabot/go.mod

@@ -0,0 +1,3 @@
+module github.com/SmartHoneybee/ubiquitous-memory/dependabot
+
+require github.com/mattermost/mattermost-server/v5 v5.31.0