diff --git a/build-release.patch b/build-release.patch index 2ef196a..7f2eca4 100644 --- a/build-release.patch +++ b/build-release.patch @@ -1,5 +1,5 @@ diff --git a/build/release.mk b/build/release.mk -index fa6b17566d..d0409a6953 100644 +index 3e9a11339..c8bd5409f 100644 --- a/build/release.mk +++ b/build/release.mk @@ -97,7 +97,7 @@ package: @@ -20,20 +20,21 @@ index fa6b17566d..d0409a6953 100644 @# Make osx package @# Copy binary ifeq ($(BUILDER_GOOS_GOARCH),"darwin_amd64") -@@ -195,6 +195,7 @@ endif +@@ -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") -@@ -204,7 +205,7 @@ else - cp $(GOBIN)/linux_amd64/mattermost $(DIST_PATH)/bin # from cross-compiled bin dir +@@ -207,7 +207,7 @@ else cp $(GOBIN)/linux_amd64/platform $(DIST_PATH)/bin # from cross-compiled bin dir endif -- MMCTL_FILE="linux_amd64.tar" && curl -f -O -L https://releases.mattermost.com/mmctl/v5.30.0/$$MMCTL_FILE && tar -xvf $$MMCTL_FILE -C $(DIST_PATH)/bin && rm $$MMCTL_FILE -+ #MMCTL_FILE="linux_amd64.tar" && curl -f -O -L https://releases.mattermost.com/mmctl/v5.30.0/$$MMCTL_FILE && tar -xvf $$MMCTL_FILE -C $(DIST_PATH)/bin && rm $$MMCTL_FILE + #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"; \ diff --git a/dependabot/go.mod b/dependabot/go.mod index 7869d5d..27b2d4f 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.30.1 +require github.com/mattermost/mattermost-server/v5 v5.31.0