Update to v7.1.2 (#155)

* Update to v7.1.2

* Try Node 16 again

Last time we tried to use this, we ran into all sorts of errors due to node-sass, which is used by the mattermost frontend.

I'm changing this because our build logs show NPM throwing a fit about not supporting Node 15, which we've been using. And the last several PR builds have errored out in NPM in weird ways that the internet keeps suggesting "just update NPM" to fix, so here we are.

ref: commit 69dda8131e

.github/workflows/release.yml

@@ -9,7 +9,7 @@ env:
   DEBIAN_RELEASE: buster
   DOCKER_PWD: /root
   DOCKER_IMAGE: debian:${DEBIAN_RELEASE}
-  GO_VERSION: 1.16.7
+  GO_VERSION: 1.18.1
 
 jobs:
   build:
@@ -56,8 +56,8 @@ jobs:
 
       - name: Set environment from runtime properties
         run: |
-          echo "MATTERMOST_RELEASE=$(grep 'mattermost-server' dependabot/go.mod | cut -d' ' -f3)" >> $GITHUB_ENV
+          echo "MATTERMOST_RELEASE=$(grep 'mattermost-server' dependabot/go.mod | cut -d' ' -f2)" >> $GITHUB_ENV
-          echo "MMCTL_RELEASE=$MATTERMOST_RELEASE" >> $GITHUB_ENV
+          echo "MMCTL_RELEASE=v7.1.2" >> $GITHUB_ENV
 
       - name: Pull docker image
         run: 'docker pull "${{ env.DOCKER_IMAGE }}"'

build-release.patch

@@ -1,5 +1,5 @@
 diff --git a/build/release.mk b/build/release.mk
-index 017746342..3c3e76bea 100644
+index faa027239..df40f0c68 100644
 --- a/build/release.mk
 +++ b/build/release.mk
 @@ -99,7 +99,7 @@ package-prep:
@@ -11,22 +11,14 @@ index 017746342..3c3e76bea 100644
  	cp -RL fonts $(DIST_PATH)
  	cp -RL templates $(DIST_PATH)
  	rm -rf $(DIST_PATH)/templates/*.mjml $(DIST_PATH)/templates/partials/
-@@ -159,13 +159,14 @@ else
+@@ -159,8 +159,8 @@ else
  	cp $(GOBIN)/$(CURRENT_PACKAGE_ARCH)/$(MM_BIN_NAME) $(DIST_PATH_GENERIC)/bin # from cross-compiled bin dir
  endif
  
-+	@#Copy cross-compiled MMCTL
-+	cp "${HOME}/go/src/github.com/mattermost/mmctl/mmctl" $(DIST_PATH_GENERIC)/bin
-+
- ifeq ("darwin_arm64","$(CURRENT_PACKAGE_ARCH)")
--	echo "No plugins or mmctl yet for $(CURRENT_PACKAGE_ARCH) platform, skipping..."
-+	echo "No plugins yet for $(CURRENT_PACKAGE_ARCH) platform, skipping..."
- else ifeq ("linux_arm64","$(CURRENT_PACKAGE_ARCH)")
--	echo "No plugins or mmctl yet for $(CURRENT_PACKAGE_ARCH) platform, skipping..."
-+	echo "No plugins yet for $(CURRENT_PACKAGE_ARCH) platform, skipping..."
- else
 -	#Download MMCTL for $(MMCTL_PLATFORM)
 -	scripts/download_mmctl_release.sh $(MMCTL_PLATFORM) $(DIST_PATH_GENERIC)/bin
- 	@# Prepackage plugins
++	@#Copy cross-compiled MMCTL
- 	@for plugin_package in $(PLUGIN_PACKAGES) ; do \
++	cp "${HOME}/go/src/github.com/mattermost/mmctl/mmctl" $(DIST_PATH_GENERIC)/bin
- 		ARCH=$(PLUGIN_ARCH); \
+ 
+ ifeq ("darwin_arm64","$(CURRENT_PACKAGE_ARCH)")
+ 	echo "No plugins yet for $(CURRENT_PACKAGE_ARCH) platform, skipping..."

build.sh

@@ -12,7 +12,7 @@ MMCTL_RELEASE="${MMCTL_RELEASE:-v5.26.0}"
 NODE_KEY="${NODE_KEY:-9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280}"
 NODE_RELEASE="${NODE_RELEASE:-16}"
 # golang version
-GO_VERSION="${GO_VERSION:-1.16.7}"
+GO_VERSION="${GO_VERSION:-1.18.1}"
 
 if [ "$(id -u)" -eq 0 ]; then # as root user
 	# create build user, if needed
@@ -48,7 +48,7 @@ if [ "$(id -u)" -eq 0 ]; then # as root user
 	apt-get update
 	# install dependencies
 	apt-get install --quiet \
-		wget build-essential patch git nodejs
+		wget build-essential patch git nodejs python2
 	# install 'pngquant' build dependencies (required by node module)
 	apt-get build-dep --quiet \
 		pngquant

dependabot/go.mod

@@ -1,6 +1,8 @@
 module github.com/SmartHoneybee/ubiquitous-memory/dependabot
 
-go 1.16
+go 1.18
-
-require github.com/mattermost/mattermost-server/v6 v6.2.1
 
+require (
+	github.com/mattermost/mattermost-server/v6 v7.1.2
+	github.com/mattermost/mmctl v0.0.0-20211221153052-1bb2fec4c15e
+)