mirror of
https://github.com/SmartHoneybee/ubiquitous-memory
synced 2025-04-29 23:29:39 +02:00
f1204f044c
* Bump github.com/mattermost/mattermost-server/v5 in /dependabot
Bumps [github.com/mattermost/mattermost-server/v5](https://github.com/mattermost/mattermost-server) from 5.35.2 to 5.36.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.35.2...v5.36.0)
---
updated-dependencies:
- dependency-name: github.com/mattermost/mattermost-server/v5
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* Fix dependabot auto-updates and update to 5.36.0 correctly
* Move config-reset to its own step
config-reset now (as of 5.36.0) is generated through a `go run` command.
If we pass the usual GOOS/GOARCH combo to this command, it will build
and then try to run an executable that's in a format different from the
host system, which can't succeed. This `go run`s config-reset as a
binary compatible with the host machine, then runs the full build with
the appropriate os/arch combo. All config-reset does is generate a new
config.json for the install anyway.
This make step was refactored in 3681cd3688
* More tweaks to handle new config stuff
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: parnic-sks <chris@straykitestudios.com>
50 lines
1.6 KiB
Diff
50 lines
1.6 KiB
Diff
diff --git a/build/release.mk b/build/release.mk
|
|
index 1530e75c6..befe5c9b7 100644
|
|
--- a/build/release.mk
|
|
+++ b/build/release.mk
|
|
@@ -76,7 +76,7 @@ package:
|
|
@# 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/
|
|
@@ -98,7 +98,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)
|
|
@@ -127,7 +127,7 @@ endif
|
|
|
|
|
|
@# ----- PLATFORM SPECIFIC -----
|
|
-
|
|
+_:
|
|
@# Make osx package
|
|
@# Copy binary
|
|
ifeq ($(BUILDER_GOOS_GOARCH),"darwin_amd64")
|
|
@@ -197,7 +197,7 @@ endif
|
|
rm -f $(DIST_PATH)/bin/platform.exe
|
|
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")
|
|
@@ -208,7 +208,7 @@ else
|
|
cp $(GOBIN)/linux_amd64/platform $(DIST_PATH)/bin # from cross-compiled bin dir
|
|
endif
|
|
#Download MMCTL for Linux
|
|
- scripts/download_mmctl_release.sh "Linux" $(DIST_PATH)/bin
|
|
+ #scripts/download_mmctl_release.sh "Linux" $(DIST_PATH)/bin
|
|
@# Prepackage plugins
|
|
@for plugin_package in $(PLUGIN_PACKAGES) ; do \
|
|
ARCH="linux-amd64"; \
|