mirror of
https://github.com/SmartHoneybee/ubiquitous-memory
synced 2025-10-25 15:53:48 +02:00
Bump github.com/mattermost/mattermost-server/v5 from 5.29.0 to 5.29.1 in /dependabot (#97)
* Bump github.com/mattermost/mattermost-server/v5 in /dependabot Bumps [github.com/mattermost/mattermost-server/v5](https://github.com/mattermost/mattermost-server) from 5.29.0 to 5.29.1. - [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.29.0...v5.29.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Fix dependabot go.mod * Update build-release.patch for mmctl changes * Remove additional mmctl script reference Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: parnic-sks <chris@straykitestudios.com>
This commit is contained in:
committed by
GitHub
parent
df047ff1c3
commit
f92e152276
@@ -1,8 +1,17 @@
|
|||||||
diff --git a/build/release.mk b/build/release.mk
|
diff --git a/build/release.mk b/build/release.mk
|
||||||
index 1172509..219db00 100644
|
index efc5c1f5c6..8793b1cb4f 100644
|
||||||
--- a/build/release.mk
|
--- a/build/release.mk
|
||||||
+++ b/build/release.mk
|
+++ b/build/release.mk
|
||||||
@@ -123,7 +123,7 @@ endif
|
@@ -97,7 +97,7 @@ package:
|
||||||
|
cp -RL $(BUILD_WEBAPP_DIR)/dist/* $(DIST_PATH)/client
|
||||||
|
|
||||||
|
@#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)
|
||||||
|
@@ -125,7 +125,7 @@ endif
|
||||||
|
|
||||||
|
|
||||||
@# ----- PLATFORM SPECIFIC -----
|
@# ----- PLATFORM SPECIFIC -----
|
||||||
@@ -11,7 +20,7 @@ index 1172509..219db00 100644
|
|||||||
@# Make osx package
|
@# Make osx package
|
||||||
@# Copy binary
|
@# Copy binary
|
||||||
ifeq ($(BUILDER_GOOS_GOARCH),"darwin_amd64")
|
ifeq ($(BUILDER_GOOS_GOARCH),"darwin_amd64")
|
||||||
@@ -191,7 +191,7 @@ endif
|
@@ -195,7 +195,7 @@ endif
|
||||||
rm -f $(DIST_PATH)/bin/platform.exe
|
rm -f $(DIST_PATH)/bin/platform.exe
|
||||||
rm -f $(DIST_PATH)/bin/mmctl.exe
|
rm -f $(DIST_PATH)/bin/mmctl.exe
|
||||||
rm -f $(DIST_PATH)/prepackaged_plugins/*
|
rm -f $(DIST_PATH)/prepackaged_plugins/*
|
||||||
@@ -20,11 +29,12 @@ index 1172509..219db00 100644
|
|||||||
@# Make linux package
|
@# Make linux package
|
||||||
@# Copy binary
|
@# Copy binary
|
||||||
ifeq ($(BUILDER_GOOS_GOARCH),"linux_amd64")
|
ifeq ($(BUILDER_GOOS_GOARCH),"linux_amd64")
|
||||||
@@ -201,7 +201,6 @@ else
|
@@ -206,7 +206,7 @@ else
|
||||||
cp $(GOBIN)/linux_amd64/mattermost $(DIST_PATH)/bin # from cross-compiled bin dir
|
|
||||||
cp $(GOBIN)/linux_amd64/platform $(DIST_PATH)/bin # from cross-compiled bin dir
|
cp $(GOBIN)/linux_amd64/platform $(DIST_PATH)/bin # from cross-compiled bin dir
|
||||||
endif
|
endif
|
||||||
- MMCTL_FILE="linux_amd64.tar" && curl -f -O -L https://releases.mattermost.com/mmctl/v5.28.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
|
@# Prepackage plugins
|
||||||
@for plugin_package in $(PLUGIN_PACKAGES) ; do \
|
@for plugin_package in $(PLUGIN_PACKAGES) ; do \
|
||||||
ARCH="linux-amd64"; \
|
ARCH="linux-amd64"; \
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
module github.com/SmartHoneybee/ubiquitous-memory/dependabot
|
module github.com/SmartHoneybee/ubiquitous-memory/dependabot
|
||||||
|
|
||||||
require github.com/mattermost/mattermost-server/v5 v5.29.0
|
require github.com/mattermost/mattermost-server/v5 v5.29.1
|
||||||
|
|||||||
Reference in New Issue
Block a user