1
0
mirror of https://github.com/SmartHoneybee/ubiquitous-memory synced 2025-10-24 23:33:48 +02:00

Compare commits

...

12 Commits

Author SHA1 Message Date
parnic-sks
4f364878e5 Update to Mattermost 5.31.1 (#101) 2021-02-06 16:03:38 -06:00
parnic-sks
a84d8e49ab Update to Mattermost 5.31.0 (#100) 2021-01-15 09:46:49 -06:00
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
parnic-sks
34f7ec2895 Update to Mattermost 5.28.1 (#94)
* Update to Mattermost 5.28.1

* Update release.mk patch for 5.28

* Repair to original patch text

* Run patch in batch mode

* Try to fix patch file

I'm having a hard time understanding why this is not working on CI.

* Working 5.28.1 release.mk patch

I was previously working off mattermost-server HEAD's copy of release.mk which has apparently changed since 5.28.1, so future PRs will need to make more changes to this patch. But for now, this should allow the patch to be applied.
2020-10-23 15:34:25 +00:00
dependabot-preview[bot]
04f32e9214 Bump github.com/mattermost/mattermost-server/v5 in /dependabot (#93) 2020-09-15 04:01:06 +00:00
dependabot-preview[bot]
e4b062a7f4 Bump github.com/mattermost/mattermost-server/v5 in /dependabot (#92) 2020-09-04 04:14:16 +00:00
dependabot-preview[bot]
fae0f5b8b6 Bump github.com/mattermost/mattermost-server/v5 in /dependabot (#91) 2020-08-28 23:10:00 +00:00
dependabot-preview[bot]
608535bba2 Bump github.com/mattermost/mattermost-server/v5 in /dependabot (#90) 2020-08-13 04:01:47 +00:00
dependabot-preview[bot]
1ff3276ef1 Bump github.com/mattermost/mattermost-server/v5 in /dependabot (#89) 2020-08-05 17:30:27 +00:00
dependabot-preview[bot]
9b99cea31b Bump github.com/mattermost/mattermost-server/v5 in /dependabot (#88) 2020-07-25 08:59:59 +00:00
3 changed files with 19 additions and 21 deletions

View File

@@ -1,17 +1,17 @@
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 diff --git a/build/release.mk b/build/release.mk
index 238343e..1b7859f 100644 index 3e9a11339..c8bd5409f 100644
--- a/build/release.mk --- a/build/release.mk
+++ b/build/release.mk +++ b/build/release.mk
@@ -77,7 +77,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 ----- @# ----- PLATFORM SPECIFIC -----
@@ -20,7 +20,7 @@ index 238343e..1b7859f 100644
@# Make osx package @# Make osx package
@# Copy binary @# Copy binary
ifeq ($(BUILDER_GOOS_GOARCH),"darwin_amd64") ifeq ($(BUILDER_GOOS_GOARCH),"darwin_amd64")
@@ -145,7 +145,7 @@ endif @@ -196,7 +196,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/*
@@ -29,14 +29,12 @@ index 238343e..1b7859f 100644
@# Make linux package @# Make linux package
@# Copy binary @# Copy binary
ifeq ($(BUILDER_GOOS_GOARCH),"linux_amd64") ifeq ($(BUILDER_GOOS_GOARCH),"linux_amd64")
@@ -155,7 +155,7 @@ else @@ -207,7 +207,7 @@ else
cp $(GOPATH)/bin/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 $(GOPATH)/bin/linux_amd64/platform $(DIST_PATH)/bin # from cross-compiled bin dir
endif 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 #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"; \
--
2.11.0

View File

@@ -88,7 +88,7 @@ if [ "$(go env GOOS)_$(go env GOARCH)" != 'linux_amd64' ]; then
"${HOME}/go/bin/linux_amd64" "${HOME}/go/bin/linux_amd64"
fi fi
patch --directory="${HOME}/go/src/github.com/mattermost/mattermost-server" \ 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 \ sed -i \
-e 's#go generate#env --unset=GOOS --unset=GOARCH go generate#' \ -e 's#go generate#env --unset=GOOS --unset=GOARCH go generate#' \
-e 's#$(GO) generate#env --unset=GOOS --unset=GOARCH go generate#' \ -e 's#$(GO) generate#env --unset=GOOS --unset=GOARCH go generate#' \

View File

@@ -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.25.0 require github.com/mattermost/mattermost-server/v5 v5.31.1