mirror of
https://github.com/SmartHoneybee/ubiquitous-memory
synced 2025-04-29 15:19:41 +02:00
06ac371c53
* Update for Mattermost v6 * Update release.mk patch The Mattermost build script has changed to accomplish most of what we were trying to patch it to support. The config generator is still a point of contention, and I'm having trouble getting it to work even with this patch, but wanted to toss it to the build machine to see if it works there. We may need to dig into the config generator deeper if it doesn't. There are additional build script changes after 6.0 that have, for example, linux-arm64 support already baked in, so we will eventually need to make larger changes to which platforms we build at all.
23 lines
966 B
Diff
23 lines
966 B
Diff
diff --git a/build/release.mk b/build/release.mk
|
|
index 7f989d4b4..886119275 100644
|
|
--- a/build/release.mk
|
|
+++ b/build/release.mk
|
|
@@ -71,7 +71,7 @@ package-prep:
|
|
@# Resource directories
|
|
mkdir -p $(DIST_PATH)/config
|
|
cp -L config/README.md $(DIST_PATH)/config
|
|
- OUTPUT_CONFIG=$(PWD)/$(DIST_PATH)/config/config.json go run ./scripts/config_generator
|
|
+ OUTPUT_CONFIG=$(PWD)/$(DIST_PATH)/config/config.json GOOS= GOARCH= go run ./scripts/config_generator
|
|
cp -RL fonts $(DIST_PATH)
|
|
cp -RL templates $(DIST_PATH)
|
|
rm -rf $(DIST_PATH)/templates/*.mjml $(DIST_PATH)/templates/partials/
|
|
@@ -201,7 +201,7 @@ else
|
|
cp $(GOBIN)/linux_amd64/mattermost $(DIST_PATH_LIN)/bin # from cross-compiled bin dir
|
|
endif
|
|
#Download MMCTL for Linux
|
|
- scripts/download_mmctl_release.sh "Linux" $(DIST_PATH_LIN)/bin
|
|
+ #scripts/download_mmctl_release.sh "Linux" $(DIST_PATH_LIN)/bin
|
|
@# Prepackage plugins
|
|
@for plugin_package in $(PLUGIN_PACKAGES) ; do \
|
|
ARCH="linux-amd64"; \
|