1
0
mirror of https://github.com/SmartHoneybee/ubiquitous-memory synced 2025-10-25 07:43:49 +02:00

Compare commits

..

1 Commits

Author SHA1 Message Date
Pierre de La Morinerie
304ed7d646 Attempt to fix Dependabot detection 2021-11-28 09:05:02 +01:00
4 changed files with 19 additions and 23 deletions

View File

@@ -9,7 +9,7 @@ env:
DEBIAN_RELEASE: buster DEBIAN_RELEASE: buster
DOCKER_PWD: /root DOCKER_PWD: /root
DOCKER_IMAGE: debian:${DEBIAN_RELEASE} DOCKER_IMAGE: debian:${DEBIAN_RELEASE}
GO_VERSION: 1.18.1 GO_VERSION: 1.16.7
jobs: jobs:
build: build:
@@ -56,8 +56,8 @@ jobs:
- name: Set environment from runtime properties - name: Set environment from runtime properties
run: | run: |
echo "MATTERMOST_RELEASE=$(grep 'mattermost-server' dependabot/go.mod | cut -d' ' -f2)" >> $GITHUB_ENV echo "MATTERMOST_RELEASE=$(grep 'mattermost-server' dependabot/go.mod | cut -d' ' -f3)" >> $GITHUB_ENV
echo "MMCTL_RELEASE=v7.1.2" >> $GITHUB_ENV echo "MMCTL_RELEASE=$(grep 'mmctl' dependabot/go.mod | cut -d' ' -f3)" >> $GITHUB_ENV
- name: Pull docker image - name: Pull docker image
run: 'docker pull "${{ env.DOCKER_IMAGE }}"' run: 'docker pull "${{ env.DOCKER_IMAGE }}"'

View File

@@ -1,8 +1,8 @@
diff --git a/build/release.mk b/build/release.mk diff --git a/build/release.mk b/build/release.mk
index faa027239..df40f0c68 100644 index 7f989d4b4..886119275 100644
--- a/build/release.mk --- a/build/release.mk
+++ b/build/release.mk +++ b/build/release.mk
@@ -99,7 +99,7 @@ package-prep: @@ -71,7 +71,7 @@ package-prep:
@# Resource directories @# Resource directories
mkdir -p $(DIST_PATH)/config mkdir -p $(DIST_PATH)/config
cp -L config/README.md $(DIST_PATH)/config cp -L config/README.md $(DIST_PATH)/config
@@ -11,14 +11,12 @@ index faa027239..df40f0c68 100644
cp -RL fonts $(DIST_PATH) cp -RL fonts $(DIST_PATH)
cp -RL templates $(DIST_PATH) cp -RL templates $(DIST_PATH)
rm -rf $(DIST_PATH)/templates/*.mjml $(DIST_PATH)/templates/partials/ rm -rf $(DIST_PATH)/templates/*.mjml $(DIST_PATH)/templates/partials/
@@ -159,8 +159,8 @@ else @@ -201,7 +201,7 @@ else
cp $(GOBIN)/$(CURRENT_PACKAGE_ARCH)/$(MM_BIN_NAME) $(DIST_PATH_GENERIC)/bin # from cross-compiled bin dir cp $(GOBIN)/linux_amd64/mattermost $(DIST_PATH_LIN)/bin # from cross-compiled bin dir
endif endif
#Download MMCTL for Linux
- #Download MMCTL for $(MMCTL_PLATFORM) - scripts/download_mmctl_release.sh "Linux" $(DIST_PATH_LIN)/bin
- scripts/download_mmctl_release.sh $(MMCTL_PLATFORM) $(DIST_PATH_GENERIC)/bin + cp "${HOME}/go/src/github.com/mattermost/mmctl/mmctl" $(DIST_PATH_LIN)/bin
+ @#Copy cross-compiled MMCTL @# Prepackage plugins
+ cp "${HOME}/go/src/github.com/mattermost/mmctl/mmctl" $(DIST_PATH_GENERIC)/bin @for plugin_package in $(PLUGIN_PACKAGES) ; do \
ARCH="linux-amd64"; \
ifeq ("darwin_arm64","$(CURRENT_PACKAGE_ARCH)")
echo "No plugins yet for $(CURRENT_PACKAGE_ARCH) platform, skipping..."

View File

@@ -10,9 +10,9 @@ MATTERMOST_RELEASE="${MATTERMOST_RELEASE:-v5.26.0}"
MMCTL_RELEASE="${MMCTL_RELEASE:-v5.26.0}" MMCTL_RELEASE="${MMCTL_RELEASE:-v5.26.0}"
# node key id and release # node key id and release
NODE_KEY="${NODE_KEY:-9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280}" NODE_KEY="${NODE_KEY:-9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280}"
NODE_RELEASE="${NODE_RELEASE:-16}" NODE_RELEASE="${NODE_RELEASE:-10}"
# golang version # golang version
GO_VERSION="${GO_VERSION:-1.18.1}" GO_VERSION="${GO_VERSION:-1.16.7}"
if [ "$(id -u)" -eq 0 ]; then # as root user if [ "$(id -u)" -eq 0 ]; then # as root user
# create build user, if needed # create build user, if needed
@@ -48,7 +48,7 @@ if [ "$(id -u)" -eq 0 ]; then # as root user
apt-get update apt-get update
# install dependencies # install dependencies
apt-get install --quiet \ apt-get install --quiet \
wget build-essential patch git nodejs python2 wget build-essential patch git nodejs
# install 'pngquant' build dependencies (required by node module) # install 'pngquant' build dependencies (required by node module)
apt-get build-dep --quiet \ apt-get build-dep --quiet \
pngquant pngquant

View File

@@ -1,8 +1,6 @@
module github.com/SmartHoneybee/ubiquitous-memory/dependabot module github.com/SmartHoneybee/ubiquitous-memory/dependabot
go 1.18 go 1.16
require ( require github.com/mattermost/mattermost-server/v6 v6.0.2
github.com/mattermost/mattermost-server/v6 v7.1.2 require github.com/mattermost/mmctl/v1 v6.0.0
github.com/mattermost/mmctl v0.0.0-20211221153052-1bb2fec4c15e
)