mirror of
https://github.com/SmartHoneybee/ubiquitous-memory
synced 2025-10-24 15:23:49 +02:00
Compare commits
11 Commits
fix-depend
...
v6.6.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
404ed7f60c | ||
|
|
890eb1c602 | ||
|
|
476501913c | ||
|
|
d5c44dd9a8 | ||
|
|
a624e66742 | ||
|
|
5d1eec08f2 | ||
|
|
b4bfed6058 | ||
|
|
155ef473dd | ||
|
|
69dda8131e | ||
|
|
a02a6b4386 | ||
|
|
3aec2b6302 |
4
.github/workflows/release.yml
vendored
4
.github/workflows/release.yml
vendored
@@ -56,8 +56,8 @@ jobs:
|
||||
|
||||
- name: Set environment from runtime properties
|
||||
run: |
|
||||
echo "MATTERMOST_RELEASE=$(grep 'mattermost-server' dependabot/go.mod | cut -d' ' -f3)" >> $GITHUB_ENV
|
||||
echo "MMCTL_RELEASE=$(grep 'mmctl' dependabot/go.mod | cut -d' ' -f3)" >> $GITHUB_ENV
|
||||
echo "MATTERMOST_RELEASE=$(grep 'mattermost-server' dependabot/go.mod | cut -d' ' -f2)" >> $GITHUB_ENV
|
||||
echo "MMCTL_RELEASE=v6.3.3" >> $GITHUB_ENV
|
||||
|
||||
- name: Pull docker image
|
||||
run: 'docker pull "${{ env.DOCKER_IMAGE }}"'
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/build/release.mk b/build/release.mk
|
||||
index 7f989d4b4..886119275 100644
|
||||
index faa027239..df40f0c68 100644
|
||||
--- a/build/release.mk
|
||||
+++ b/build/release.mk
|
||||
@@ -71,7 +71,7 @@ package-prep:
|
||||
@@ -99,7 +99,7 @@ package-prep:
|
||||
@# Resource directories
|
||||
mkdir -p $(DIST_PATH)/config
|
||||
cp -L config/README.md $(DIST_PATH)/config
|
||||
@@ -11,12 +11,14 @@ index 7f989d4b4..886119275 100644
|
||||
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
|
||||
@@ -159,8 +159,8 @@ else
|
||||
cp $(GOBIN)/$(CURRENT_PACKAGE_ARCH)/$(MM_BIN_NAME) $(DIST_PATH_GENERIC)/bin # from cross-compiled bin dir
|
||||
endif
|
||||
#Download MMCTL for Linux
|
||||
- scripts/download_mmctl_release.sh "Linux" $(DIST_PATH_LIN)/bin
|
||||
+ cp "${HOME}/go/src/github.com/mattermost/mmctl/mmctl" $(DIST_PATH_LIN)/bin
|
||||
@# Prepackage plugins
|
||||
@for plugin_package in $(PLUGIN_PACKAGES) ; do \
|
||||
ARCH="linux-amd64"; \
|
||||
|
||||
- #Download MMCTL for $(MMCTL_PLATFORM)
|
||||
- scripts/download_mmctl_release.sh $(MMCTL_PLATFORM) $(DIST_PATH_GENERIC)/bin
|
||||
+ @#Copy cross-compiled MMCTL
|
||||
+ cp "${HOME}/go/src/github.com/mattermost/mmctl/mmctl" $(DIST_PATH_GENERIC)/bin
|
||||
|
||||
ifeq ("darwin_arm64","$(CURRENT_PACKAGE_ARCH)")
|
||||
echo "No plugins yet for $(CURRENT_PACKAGE_ARCH) platform, skipping..."
|
||||
|
||||
4
build.sh
4
build.sh
@@ -10,7 +10,7 @@ MATTERMOST_RELEASE="${MATTERMOST_RELEASE:-v5.26.0}"
|
||||
MMCTL_RELEASE="${MMCTL_RELEASE:-v5.26.0}"
|
||||
# node key id and release
|
||||
NODE_KEY="${NODE_KEY:-9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280}"
|
||||
NODE_RELEASE="${NODE_RELEASE:-10}"
|
||||
NODE_RELEASE="${NODE_RELEASE:-15}"
|
||||
# golang version
|
||||
GO_VERSION="${GO_VERSION:-1.16.7}"
|
||||
|
||||
@@ -48,7 +48,7 @@ if [ "$(id -u)" -eq 0 ]; then # as root user
|
||||
apt-get update
|
||||
# install dependencies
|
||||
apt-get install --quiet \
|
||||
wget build-essential patch git nodejs
|
||||
wget build-essential patch git nodejs python2
|
||||
# install 'pngquant' build dependencies (required by node module)
|
||||
apt-get build-dep --quiet \
|
||||
pngquant
|
||||
|
||||
@@ -2,5 +2,7 @@ module github.com/SmartHoneybee/ubiquitous-memory/dependabot
|
||||
|
||||
go 1.16
|
||||
|
||||
require github.com/mattermost/mattermost-server/v6 v6.0.2
|
||||
require github.com/mattermost/mmctl v6.0.0
|
||||
require (
|
||||
github.com/mattermost/mattermost-server/v6 v6.6.0
|
||||
github.com/mattermost/mmctl v0.0.0-20211221153052-1bb2fec4c15e
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user