1
0
mirror of https://github.com/SmartHoneybee/ubiquitous-memory synced 2025-10-25 15:53:48 +02:00

Compare commits

..

3 Commits

Author SHA1 Message Date
parnic-sks
81b4106fc7 Mattermost 5.30.1 release (#98)
* Mattermost 5.30.0 release

* Update to 5.30.1 due to Mattermost release bug
2020-12-21 09:07:32 -06:00
dependabot-preview[bot]
f92e152276 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>
2020-12-06 10:52:33 -06:00
dependabot-preview[bot]
df047ff1c3 Bump github.com/mattermost/mattermost-server/v5 from 5.28.1 to 5.29.0 in /dependabot (#95)
Bump github.com/mattermost/mattermost-server/v5 in /dependabot

Bumps [github.com/mattermost/mattermost-server/v5](https://github.com/mattermost/mattermost-server) from 5.28.1 to 5.29.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.28.1...v5.29.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: parnic-sks <chris@straykitestudios.com>
2020-11-21 14:30:01 +00:00
2 changed files with 17 additions and 8 deletions

View File

@@ -1,8 +1,17 @@
diff --git a/build/release.mk b/build/release.mk
index 1172509..219db00 100644
index fa6b17566d..d0409a6953 100644
--- a/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)
@@ -126,7 +126,7 @@ endif
@# ----- PLATFORM SPECIFIC -----
@@ -11,20 +20,20 @@ index 1172509..219db00 100644
@# Make osx package
@# Copy binary
ifeq ($(BUILDER_GOOS_GOARCH),"darwin_amd64")
@@ -191,7 +191,7 @@ endif
rm -f $(DIST_PATH)/bin/platform.exe
@@ -195,6 +195,7 @@ endif
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")
@@ -201,7 +201,6 @@ else
@@ -204,7 +205,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
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
- 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
@# Prepackage plugins
@for plugin_package in $(PLUGIN_PACKAGES) ; do \
ARCH="linux-amd64"; \

View File

@@ -1,3 +1,3 @@
module github.com/SmartHoneybee/ubiquitous-memory/dependabot
require github.com/mattermost/mattermost-server/v5 v5.28.1
require github.com/mattermost/mattermost-server/v5 v5.30.1