mirror of
https://github.com/SmartHoneybee/ubiquitous-memory
synced 2025-10-24 23:33:48 +02:00
Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
34f7ec2895 | ||
|
|
04f32e9214 | ||
|
|
e4b062a7f4 | ||
|
|
fae0f5b8b6 | ||
|
|
608535bba2 | ||
|
|
1ff3276ef1 |
@@ -1,17 +1,8 @@
|
|||||||
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 1172509..219db00 100644
|
||||||
--- a/build/release.mk
|
--- a/build/release.mk
|
||||||
+++ b/build/release.mk
|
+++ b/build/release.mk
|
||||||
@@ -77,7 +77,7 @@ endif
|
@@ -123,7 +123,7 @@ endif
|
||||||
|
|
||||||
|
|
||||||
@# ----- PLATFORM SPECIFIC -----
|
@# ----- PLATFORM SPECIFIC -----
|
||||||
@@ -20,7 +11,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
|
@@ -191,7 +191,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 +20,11 @@ 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
|
@@ -201,7 +201,6 @@ else
|
||||||
cp $(GOPATH)/bin/linux_amd64/mattermost $(DIST_PATH)/bin # from cross-compiled bin dir
|
cp $(GOBIN)/linux_amd64/mattermost $(DIST_PATH)/bin # from cross-compiled bin dir
|
||||||
cp $(GOPATH)/bin/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://github.com/mattermost/mmctl/releases/download/$(MMCTL_REL_TO_DOWNLOAD)/$$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.28.0/$$MMCTL_FILE && tar -xvf $$MMCTL_FILE -C $(DIST_PATH)/bin && rm $$MMCTL_FILE
|
||||||
+
|
|
||||||
@# 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
|
|
||||||
|
|||||||
2
build.sh
2
build.sh
@@ -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#' \
|
||||||
|
|||||||
@@ -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.1
|
require github.com/mattermost/mattermost-server/v5 v5.28.1
|
||||||
|
|||||||
Reference in New Issue
Block a user