Update for Mattermost v6 (#133)

* Update for Mattermost v6

* Update release.mk patch

The Mattermost build script has changed to accomplish most of what we
were trying to patch it to support. The config generator is still a
point of contention, and I'm having trouble getting it to work even with
this patch, but wanted to toss it to the build machine to see if it
works there. We may need to dig into the config generator deeper if it
doesn't.

There are additional build script changes after 6.0 that have, for
example, linux-arm64 support already baked in, so we will eventually
need to make larger changes to which platforms we build at all.

.github/workflows/release.yml

@@ -9,7 +9,7 @@ env:
   DEBIAN_RELEASE: buster
   DOCKER_PWD: /root
   DOCKER_IMAGE: debian:${DEBIAN_RELEASE}
-  GO_VERSION: 1.15.5
+  GO_VERSION: 1.16.7
 
 jobs:
   build:

build-release.patch

@@ -1,8 +1,8 @@
 diff --git a/build/release.mk b/build/release.mk
-index 1530e75c6..befe5c9b7 100644
+index 7f989d4b4..886119275 100644
 --- a/build/release.mk
 +++ b/build/release.mk
-@@ -76,7 +76,7 @@ package:
+@@ -71,7 +71,7 @@ package-prep:
  	@# Resource directories
  	mkdir -p $(DIST_PATH)/config
  	cp -L config/README.md $(DIST_PATH)/config
@@ -11,39 +11,12 @@ index 1530e75c6..befe5c9b7 100644
  	cp -RL fonts $(DIST_PATH)
  	cp -RL templates $(DIST_PATH)
  	rm -rf $(DIST_PATH)/templates/*.mjml $(DIST_PATH)/templates/partials/
-@@ -98,7 +98,7 @@ package:
+@@ -201,7 +201,7 @@ else
- 	cp -RL $(BUILD_WEBAPP_DIR)/dist/* $(DIST_PATH)/client
+ 	cp $(GOBIN)/linux_amd64/mattermost $(DIST_PATH_LIN)/bin # from cross-compiled bin dir
- 
- 	@#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)
-@@ -127,7 +127,7 @@ endif
- 
- 
- 	@# ----- PLATFORM SPECIFIC -----
--
-+_:
- 	@# Make osx package
- 	@# Copy binary
- ifeq ($(BUILDER_GOOS_GOARCH),"darwin_amd64")
-@@ -197,7 +197,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")
-@@ -208,7 +208,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_LIN)/bin
-+	#scripts/download_mmctl_release.sh "Linux" $(DIST_PATH)/bin
++	#scripts/download_mmctl_release.sh "Linux" $(DIST_PATH_LIN)/bin
  	@# Prepackage plugins
  	@for plugin_package in $(PLUGIN_PACKAGES) ; do \
  		ARCH="linux-amd64"; \

build.sh

@@ -11,7 +11,7 @@ MATTERMOST_RELEASE="${MATTERMOST_RELEASE:-v5.4.0}"
 NODE_KEY="${NODE_KEY:-9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280}"
 NODE_RELEASE="${NODE_RELEASE:-10}"
 # golang version
-GO_VERSION="${GO_VERSION:-1.15.5}"
+GO_VERSION="${GO_VERSION:-1.16.7}"
 
 if [ "$(id -u)" -eq 0 ]; then # as root user
 	# create build user, if needed
@@ -33,9 +33,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 parallel
+		gnupg2 dirmngr apt-transport-https ca-certificates curl
-	# receive missing key (retry on failure)
+	# receive missing key
-	parallel --verbose --delay=30 --retries=5 "apt-key adv --keyserver 'ipv4.pool.sks-keyservers.net' --recv-keys '{}'" ::: "${NODE_KEY}"
+	curl -fsSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -
 	# 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"

dependabot/dummy.go

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

dependabot/go.mod

@@ -1,3 +1,5 @@
 module github.com/SmartHoneybee/ubiquitous-memory/dependabot
 
-require github.com/mattermost/mattermost-server/v5 v5.36.0
+go 1.16
+
+require github.com/mattermost/mattermost-server/v6 v6.0.0