mirror of
https://github.com/SmartHoneybee/ubiquitous-memory
synced 2025-04-29 23:29:39 +02:00
Bump github.com/mattermost/mattermost-server/v5 from 5.19.1 to 5.20.0 in /dependabot (#74)
Bump github.com/mattermost/mattermost-server/v5 in /dependabot Bumps [github.com/mattermost/mattermost-server/v5](https://github.com/mattermost/mattermost-server) from 5.19.1 to 5.20.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.19.1...v5.20.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
This commit is contained in:
parent
c696751a66
commit
5e14b05358
@ -11,8 +11,8 @@ diff --git a/build/release.mk b/build/release.mk
|
||||
index 238343e..1b7859f 100644
|
||||
--- a/build/release.mk
|
||||
+++ b/build/release.mk
|
||||
@@ -70,7 +70,7 @@ endif
|
||||
done
|
||||
@@ -77,7 +77,7 @@ endif
|
||||
|
||||
|
||||
@# ----- PLATFORM SPECIFIC -----
|
||||
-
|
||||
@ -20,14 +20,23 @@ index 238343e..1b7859f 100644
|
||||
@# Make osx package
|
||||
@# Copy binary
|
||||
ifeq ($(BUILDER_GOOS_GOARCH),"darwin_amd64")
|
||||
@@ -110,7 +110,7 @@ endif
|
||||
rm -f $(DIST_PATH)/bin/mattermost.exe
|
||||
@@ -145,7 +145,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")
|
||||
@@ -155,7 +155,7 @@ else
|
||||
cp $(GOPATH)/bin/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
|
||||
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
|
||||
+
|
||||
@# Prepackage plugins
|
||||
@for plugin_package in $(PLUGIN_PACKAGES) ; do \
|
||||
ARCH="linux-amd64"; \
|
||||
--
|
||||
2.11.0
|
||||
|
18
build.sh
18
build.sh
@ -35,20 +35,17 @@ if [ "$(id -u)" -eq 0 ]; then # as root user
|
||||
# receive missing key (retry on failure)
|
||||
parallel --verbose --delay=30 --retries=5 "apt-key adv --keyserver 'ipv4.pool.sks-keyservers.net' --recv-keys '{}'" ::: "${NODE_KEY}"
|
||||
# add required additional repositories
|
||||
printf 'deb-src http://deb.debian.org/debian %s main\n' "${DEBIAN_RELEASE}" 'testing' \
|
||||
> "/etc/apt/sources.list.d/source.list"
|
||||
printf 'deb-src http://deb.debian.org/debian %s main' "${DEBIAN_RELEASE}" \
|
||||
> "/etc/apt/sources.list.d/${DEBIAN_RELEASE}-source.list"
|
||||
printf 'deb http://deb.debian.org/debian %s-backports main' "${DEBIAN_RELEASE}" \
|
||||
> "/etc/apt/sources.list.d/${DEBIAN_RELEASE}-backports.list"
|
||||
printf 'deb https://deb.nodesource.com/node_%s.x %s main' "${NODE_RELEASE}" "${DEBIAN_RELEASE}" \
|
||||
> '/etc/apt/sources.list.d/nodesource.list'
|
||||
# update repositories
|
||||
apt-get update
|
||||
# install go from testing sources; FIXME use backports https://bugs.debian.org/943399
|
||||
_gov="1.13"
|
||||
export DEB_BUILD_OPTIONS="nocheck nodoc parallel=$(nproc) terse"
|
||||
apt-get build-dep "golang-${_gov}-go/testing"
|
||||
apt-get source --compile "golang-${_gov}-go/testing"
|
||||
apt-get install --quiet \
|
||||
"${PWD}/golang-${_gov}"*".deb"
|
||||
ln --symbolic --force "/usr/lib/go-${_gov}/bin/go" /usr/bin/go # FIXME ugly
|
||||
# install go from Debian backports
|
||||
apt-get install --quiet --target-release "${DEBIAN_RELEASE}-backports" \
|
||||
golang-go
|
||||
# install dependencies
|
||||
apt-get install --quiet \
|
||||
wget build-essential patch git nodejs
|
||||
@ -98,7 +95,6 @@ sed -i \
|
||||
-e 's#PWD#CURDIR#' \
|
||||
"${HOME}/go/src/github.com/mattermost/mattermost-server/Makefile" \
|
||||
"${HOME}/go/src/github.com/mattermost/mattermost-server/build/release.mk"
|
||||
sed -i -e '107d' "${HOME}/go/src/github.com/mattermost/mattermost-server/go.mod" # invalid pseudo-version: does not match version-control timestamp
|
||||
make --directory="${HOME}/go/src/github.com/mattermost/mattermost-server" \
|
||||
config-reset build-linux package-linux \
|
||||
BUILD_NUMBER="dev-$(go env GOOS)-$(go env GOARCH)-${MATTERMOST_RELEASE}" \
|
||||
|
@ -1,3 +1,3 @@
|
||||
module github.com/SmartHoneybee/ubiquitous-memory/dependabot
|
||||
|
||||
require github.com/mattermost/mattermost-server/v5 v5.19.1
|
||||
require github.com/mattermost/mattermost-server/v5 v5.20.0
|
||||
|
Loading…
x
Reference in New Issue
Block a user