From f1204f044c09d8172693430d8267fc5aac197d0a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Jun 2021 08:35:08 -0500
Subject: [PATCH] Bump github.com/mattermost/mattermost-server/v5 from 5.35.2
 to 5.36.0 in /dependabot (#121)

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

Bumps [github.com/mattermost/mattermost-server/v5](https://github.com/mattermost/mattermost-server) from 5.35.2 to 5.36.0.
- [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.35.2...v5.36.0)

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

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

* Fix dependabot auto-updates and update to 5.36.0 correctly

* Move config-reset to its own step

config-reset now (as of 5.36.0) is generated through a `go run` command.
If we pass the usual GOOS/GOARCH combo to this command, it will build
and then try to run an executable that's in a format different from the
host system, which can't succeed. This `go run`s config-reset as a
binary compatible with the host machine, then runs the full build with
the appropriate os/arch combo. All config-reset does is generate a new
config.json for the install anyway.

This make step was refactored in https://github.com/mattermost/mattermost-server/commit/3681cd3688408c96f1e26909a521bf72edceae57

* More tweaks to handle new config stuff

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: parnic-sks <chris@straykitestudios.com>
---
 build-release.patch | 19 ++++++++++++++-----
 build.sh            |  7 ++++++-
 dependabot/dummy.go |  2 +-
 dependabot/go.mod   |  2 +-
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/build-release.patch b/build-release.patch
index 7f2eca4..227b8b5 100644
--- a/build-release.patch
+++ b/build-release.patch
@@ -1,8 +1,17 @@
 diff --git a/build/release.mk b/build/release.mk
-index 3e9a11339..c8bd5409f 100644
+index 1530e75c6..befe5c9b7 100644
 --- a/build/release.mk
 +++ b/build/release.mk
-@@ -97,7 +97,7 @@ package:
+@@ -76,7 +76,7 @@ package:
+ 	@# 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/
+@@ -98,7 +98,7 @@ package:
  	cp -RL $(BUILD_WEBAPP_DIR)/dist/* $(DIST_PATH)/client
  
  	@#Download MMCTL
@@ -11,7 +20,7 @@ index 3e9a11339..c8bd5409f 100644
  
  	@# Help files
  ifeq ($(BUILD_ENTERPRISE_READY),true)
-@@ -126,7 +126,7 @@ endif
+@@ -127,7 +127,7 @@ endif
  
  
  	@# ----- PLATFORM SPECIFIC -----
@@ -20,7 +29,7 @@ index 3e9a11339..c8bd5409f 100644
  	@# Make osx package
  	@# Copy binary
  ifeq ($(BUILDER_GOOS_GOARCH),"darwin_amd64")
-@@ -196,7 +196,7 @@ endif
+@@ -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/*
@@ -29,7 +38,7 @@ index 3e9a11339..c8bd5409f 100644
  	@# Make linux package
  	@# Copy binary
  ifeq ($(BUILDER_GOOS_GOARCH),"linux_amd64")
-@@ -207,7 +207,7 @@ else
+@@ -208,7 +208,7 @@ else
  	cp $(GOBIN)/linux_amd64/platform $(DIST_PATH)/bin # from cross-compiled bin dir
  endif
  	#Download MMCTL for Linux
diff --git a/build.sh b/build.sh
index 827a913..0a37aa5 100755
--- a/build.sh
+++ b/build.sh
@@ -103,7 +103,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=''
diff --git a/dependabot/dummy.go b/dependabot/dummy.go
index 99a717e..d216c1b 100644
--- a/dependabot/dummy.go
+++ b/dependabot/dummy.go
@@ -1,3 +1,3 @@
 package main
-import _ "github.com/mattermost/mattermost-server/model"
+import _ "github.com/mattermost/mattermost-server/v5/model"
 func main() {/* dummy file */}
diff --git a/dependabot/go.mod b/dependabot/go.mod
index 21d0a9f..1d7c84c 100644
--- a/dependabot/go.mod
+++ b/dependabot/go.mod
@@ -1,3 +1,3 @@
 module github.com/SmartHoneybee/ubiquitous-memory/dependabot
 
-require github.com/mattermost/mattermost-server/v5 v5.35.3
+require github.com/mattermost/mattermost-server/v5 v5.36.0