Bump github.com/mattermost/mattermost-server/v6 from 6.3.2 to 6.3.3 in /dependabot (#143)

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

Bumps [github.com/mattermost/mattermost-server/v6](https://github.com/mattermost/mattermost-server) from 6.3.2 to 6.3.3.
- [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/v6.3.2...v6.3.3)

---
updated-dependencies:
- dependency-name: github.com/mattermost/mattermost-server/v6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* Use the mattermost-server version for mmctl

Since mmctl isn't versioned in a gomodules-friendly way, we either need to manually maintain the version in the release script or just assume/hope that they continue to create releases matching the mattermost-server version. So far that has always been the case, so we can ignore the go.mod version string.

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: parnic-sks <chris@straykitestudios.com>

.github/dependabot.yml

@@ -0,0 +1,9 @@
+version: 2
+updates:
+- package-ecosystem: gomod
+  directory: "/dependabot"
+  schedule:
+    interval: daily
+    time: "00:15"
+  open-pull-requests-limit: 99
+  target-branch: master

.github/lock.yml

@@ -1,7 +0,0 @@
-# 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

.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

.github/workflows/release.yml

@@ -0,0 +1,96 @@
+name: Package and release
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+env:
+  DEBIAN_RELEASE: buster
+  DOCKER_PWD: /root
+  DOCKER_IMAGE: debian:${DEBIAN_RELEASE}
+  GO_VERSION: 1.16.7
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - os: dragonfly
+            arch: amd64
+          - os: freebsd
+            arch: amd64
+          - os: freebsd
+            arch: arm
+          - os: linux
+            arch: arm
+          - os: linux
+            arch: arm64
+          - os: linux
+            arch: mips
+          - os: linux
+            arch: mips64
+          - os: linux
+            arch: mips64le
+          - os: linux
+            arch: mipsle
+          - os: linux
+            arch: ppc64
+          - os: linux
+            arch: ppc64le
+          - os: linux
+            arch: s390x
+          - os: netbsd
+            arch: amd64
+          - os: netbsd
+            arch: arm
+          - os: openbsd
+            arch: amd64
+          - os: openbsd
+            arch: arm
+
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v2
+
+      - name: Set environment from runtime properties
+        run: |
+          echo "MATTERMOST_RELEASE=$(grep 'mattermost-server' dependabot/go.mod | cut -d' ' -f2)" >> $GITHUB_ENV
+          echo "MMCTL_RELEASE=$(grep 'mattermost-server' dependabot/go.mod | cut -d' ' -f2)" >> $GITHUB_ENV
+
+      - name: Pull docker image
+        run: 'docker pull "${{ env.DOCKER_IMAGE }}"'
+
+      - name: Build
+        env:
+          GOOS: ${{ matrix.os }}
+          GOARCH: ${{ matrix.arch }}
+        run: docker run --mount="type=bind,source=$PWD,destination=${{ env.DOCKER_PWD }}" --rm=true --tty=true --workdir="${{ env.DOCKER_PWD }}" -e DEBIAN_RELEASE -e MATTERMOST_RELEASE -e MMCTL_RELEASE -e GOOS -e GOARCH "${{ env.DOCKER_IMAGE }}" ./build.sh
+
+      - name: Tag release
+        if: github.ref == 'refs/heads/master'
+        uses: actions/github-script@v3
+        # this throws an error if the tag already exists. can't find a way around that without writing our own Github REST client or forking github's scripts repo.
+        # would prefer to do this before any of these jobs run, but we need to know the mattermost version which only happens after a clone. could potentially
+        # setup a separate job which does clone + tag, but felt like this was "good enough" for now.
+        continue-on-error: true
+        with:
+          script: |
+            github.git.createRef({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              ref: 'refs/tags/${{ env.MATTERMOST_RELEASE }}',
+              sha: context.sha
+            })
+
+      - name: Create Github release
+        if: github.ref == 'refs/heads/master'
+        uses: softprops/action-gh-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ env.MATTERMOST_RELEASE }}
+          files: |
+            mattermost-${{ env.MATTERMOST_RELEASE }}-${{ matrix.os }}-${{ matrix.arch }}.tar.gz
+            mattermost-${{ env.MATTERMOST_RELEASE }}-${{ matrix.os }}-${{ matrix.arch }}.tar.gz.sha512sum

.travis.yml

@@ -1,44 +0,0 @@
-language: c
-os: linux
-dist: bionic
-services:
-  - docker
-env:
-  global:
-    - DEBIAN_RELEASE='buster'
-    - DOCKER_PWD='/root'
-    - DOCKER_IMAGE="debian:${DEBIAN_RELEASE}"
-  matrix:
-    - 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:
-  - export MATTERMOST_RELEASE="$(grep 'mattermost' dependabot/go.mod | cut -d' ' -f3)"
-  - docker pull "${DOCKER_IMAGE}"
-  - chmod +x build.sh
-script:
-  - 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-${MATTERMOST_RELEASE}-${GOOS}-${GOARCH}.tar.gz"
-    - "${TRAVIS_BUILD_DIR}/mattermost-${MATTERMOST_RELEASE}-${GOOS}-${GOARCH}.tar.gz.sha512sum"
-  skip_cleanup: true

README.md

@@ -1,9 +1,9 @@
 # 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)
+[![Build Status](https://github.com/SmartHoneybee/ubiquitous-memory/actions/workflows/release.yml/badge.svg)](https://github.com/SmartHoneybee/ubiquitous-memory/actions/workflows/release.yml)
 
-[Travis CI][0] recipe that builds [Mattermost][1] for various operating systems and architectures.
+[Github Actions][0] script that builds [Mattermost][1] for various operating systems and architectures.
 
-[0]: https://travis-ci.org/SmartHoneybee/ubiquitous-memory
+[0]: https://github.com/SmartHoneybee/ubiquitous-memory/actions
 [1]: https://mattermost.com/
 [2]: https://en.wikipedia.org/wiki/Here_be_dragons

build-release.patch

@@ -1,42 +1,24 @@
-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 faa027239..df40f0c68 100644
 --- a/build/release.mk
 +++ b/build/release.mk
-@@ -77,7 +77,7 @@ endif
- 
- 
- 	@# ----- PLATFORM SPECIFIC -----
--
-+_:
- 	@# Make osx package
- 	@# Copy binary
- ifeq ($(BUILDER_GOOS_GOARCH),"darwin_amd64")
-@@ -145,7 +145,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")
-@@ -155,7 +155,7 @@ else
- 	cp $(GOPATH)/bin/linux_amd64/mattermost $(DIST_PATH)/bin # from cross-compiled bin dir
- 	cp $(GOPATH)/bin/linux_amd64/platform $(DIST_PATH)/bin # from cross-compiled bin dir
+@@ -99,7 +99,7 @@ package-prep:
+ 	@# Resource directories
+ 	mkdir -p $(DIST_PATH)/config
+ 	cp -L config/README.md $(DIST_PATH)/config
+-	OUTPUT_CONFIG=$(PWD)/$(DIST_PATH)/config/config.json go run ./scripts/config_generator
++	OUTPUT_CONFIG=$(PWD)/$(DIST_PATH)/config/config.json GOOS= GOARCH= go run ./scripts/config_generator
+ 	cp -RL fonts $(DIST_PATH)
+ 	cp -RL templates $(DIST_PATH)
+ 	rm -rf $(DIST_PATH)/templates/*.mjml $(DIST_PATH)/templates/partials/
+@@ -159,8 +159,8 @@ else
+ 	cp $(GOBIN)/$(CURRENT_PACKAGE_ARCH)/$(MM_BIN_NAME) $(DIST_PATH_GENERIC)/bin # from cross-compiled bin dir
  endif
--	MMCTL_FILE="linux_amd64.tar" && curl -f -O -L https://github.com/mattermost/mmctl/releases/download/$(MMCTL_REL_TO_DOWNLOAD)/$$MMCTL_FILE && tar -xvf $$MMCTL_FILE -C $(DIST_PATH)/bin && rm $$MMCTL_FILE
-+
- 	@# Prepackage plugins
- 	@for plugin_package in $(PLUGIN_PACKAGES) ; do \
- 		ARCH="linux-amd64"; \
--- 
-2.11.0
+ 
+-	#Download MMCTL for $(MMCTL_PLATFORM)
+-	scripts/download_mmctl_release.sh $(MMCTL_PLATFORM) $(DIST_PATH_GENERIC)/bin
++	@#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 yet for $(CURRENT_PACKAGE_ARCH) platform, skipping..."

build.sh

@@ -6,10 +6,13 @@ 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}"
+MATTERMOST_RELEASE="${MATTERMOST_RELEASE:-v5.26.0}"
+MMCTL_RELEASE="${MMCTL_RELEASE:-v5.26.0}"
 # node key id and release
 NODE_KEY="${NODE_KEY:-9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280}"
-NODE_RELEASE="${NODE_RELEASE:-10}"
+NODE_RELEASE="${NODE_RELEASE:-15}"
+# golang version
+GO_VERSION="${GO_VERSION:-1.16.7}"
 
 if [ "$(id -u)" -eq 0 ]; then # as root user
 	# create build user, if needed
@@ -31,9 +34,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
-	# 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}"
+		gnupg2 dirmngr apt-transport-https ca-certificates curl
+	# receive missing 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"
@@ -43,19 +46,22 @@ if [ "$(id -u)" -eq 0 ]; then # as root user
 		> '/etc/apt/sources.list.d/nodesource.list'
 	# update repositories
 	apt-get update
-	# install go from Debian backports
-	apt-get install --quiet --target-release "${DEBIAN_RELEASE}-backports" \
-		golang-go
 	# 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
+	# install go from golang.org
+	wget https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz
+	tar -xvf go${GO_VERSION}.linux-amd64.tar.gz
+	mv go /usr/local
+	export GOROOT=/usr/local/go
+	export PATH=$GOROOT/bin:$PATH
 	# 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
+	# Re-invoke this build.sh script with the 'build' user
 	runuser -u "${BUILD_USER_NAME}" -- "${0}"
 	# salvage build artifacts
 	cp --verbose \
@@ -65,6 +71,8 @@ if [ "$(id -u)" -eq 0 ]; then # as root user
 	exit 0
 fi
 # as non-root user
+export GOROOT=/usr/local/go
+export PATH=$GOROOT/bin:$PATH
 cd "${HOME}"
 # download and extract Mattermost sources
 for COMPONENT in server webapp; do
@@ -74,6 +82,27 @@ for COMPONENT in server webapp; do
 	tar --directory="${HOME}/go/src/github.com/mattermost/mattermost-${COMPONENT}" \
 		--strip-components=1 --extract --file="mattermost-${COMPONENT}.tar.gz"
 done
+# prepare the go build environment
+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
+# build mmctl
+install --directory "${HOME}/go/src/github.com/mattermost/mmctl"
+wget --quiet --continue --output-document="mmctl.tar.gz" \
+	"https://github.com/mattermost/mmctl/archive/${MMCTL_RELEASE}.tar.gz"
+tar --directory="${HOME}/go/src/github.com/mattermost/mmctl" \
+	--strip-components=1 --extract --file="mmctl.tar.gz"
+find "${HOME}/go/src/github.com/mattermost/mmctl/" -type f -name '*.go' | xargs \
+	sed -i \
+	-e 's#//go:build linux || darwin#//go:build linux || darwin || dragonfly || freebsd || netbsd || openbsd#' \
+	-e 's#// +build linux darwin#// +build linux darwin dragonfly freebsd netbsd openbsd#'
+make --directory="${HOME}/go/src/github.com/mattermost/mmctl" \
+	BUILD_NUMBER="dev-$(go env GOOS)-$(go env GOARCH)-${MMCTL_RELEASE}" \
+	ADVANCED_VET=0 \
+	GO="GOARCH= GOOS= $(command -v go)"
 # build Mattermost webapp
 npm set progress false
 sed -i -e 's#--verbose#--display minimal#' \
@@ -81,14 +110,8 @@ sed -i -e 's#--verbose#--display minimal#' \
 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"
+	--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#' \
@@ -96,7 +119,12 @@ sed -i \
 	"${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 \
+	config-reset \
+	BUILD_NUMBER="dev-$(go env GOOS)-$(go env GOARCH)-${MATTERMOST_RELEASE}" \
+	GO="GOARCH= GOOS= $(command -v go)" \
+	PLUGIN_PACKAGES=''
+make --directory="${HOME}/go/src/github.com/mattermost/mattermost-server" \
+	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=''

dependabot/dummy.go

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

dependabot/go.mod

@@ -1,3 +1,8 @@
 module github.com/SmartHoneybee/ubiquitous-memory/dependabot
 
-require github.com/mattermost/mattermost-server/v5 v5.22.0
+go 1.16
+
+require (
+	github.com/mattermost/mattermost-server/v6 v6.3.3
+	github.com/mattermost/mmctl v0.0.0-20211221153052-1bb2fec4c15e
+)