Browse Source

Bump github.com/mattermost/mattermost-server from 5.17.1 to 5.17.2 in /dependabot (#69)

Bump github.com/mattermost/mattermost-server in /dependabot

Bumps [github.com/mattermost/mattermost-server](https://github.com/mattermost/mattermost-server) from 5.17.1 to 5.17.2.
- [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.17.1...v5.17.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
pull/70/head v5.17.2
dependabot-preview[bot] 3 years ago
committed by Bee
parent
commit
0e12504498
  1. 2
      .travis.yml
  2. 20
      build.sh
  3. 6
      dependabot/Gopkg.lock
  4. 2
      dependabot/Gopkg.toml
  5. 27
      go-backport.patch

2
.travis.yml

@ -5,7 +5,7 @@ service:
- docker
env:
global:
- DEBIAN_RELEASE='stretch'
- DEBIAN_RELEASE='buster'
- DOCKER_PWD='/root'
- DOCKER_IMAGE="debian:${DEBIAN_RELEASE}"
matrix:

20
build.sh

@ -35,17 +35,20 @@ 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' "${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-src http://deb.debian.org/debian %s main\n' "${DEBIAN_RELEASE}" 'testing' \
> "/etc/apt/sources.list.d/source.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 Debian backports
apt-get install --quiet --target-release "${DEBIAN_RELEASE}-backports" \
golang-go
# 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 dependencies
apt-get install --quiet \
wget build-essential patch git nodejs
@ -89,14 +92,13 @@ if [ "$(go env GOOS)_$(go env GOARCH)" != 'linux_amd64' ]; then
fi
patch --directory="${HOME}/go/src/github.com/mattermost/mattermost-server" \
--strip=1 < "${HOME}/build-release.patch"
patch --directory="${HOME}/go/src/github.com/mattermost/mattermost-server" \
--strip=1 < "${HOME}/go-backport.patch"
sed -i \
-e 's#go generate#env --unset=GOOS --unset=GOARCH go generate#' \
-e 's#$(GO) generate#env --unset=GOOS --unset=GOARCH go generate#' \
-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}" \

6
dependabot/Gopkg.lock

@ -50,7 +50,7 @@
version = "v3.0.4"
[[projects]]
digest = "1:3addeb71a2f43a7b2892183d1d2f101ce429b724ddd1071c3f088d7311a6f321"
digest = "1:471fc1ffd442691057cfb1c9df10ac7c84ee622fa02fcfa6b3da072b53241e04"
name = "github.com/mattermost/mattermost-server"
packages = [
"mlog",
@ -60,8 +60,8 @@
"utils/markdown",
]
pruneopts = ""
revision = "c81e4f87c20a717b1dc52b2b77780fa789e19148"
version = "v5.17.1"
revision = "ca0518420b931db0923c97ec17e05e150a729a64"
version = "v5.17.2"
[[projects]]
digest = "1:9fa4a4a684dfb36f3ba1b0a163225140e19e3219e5576d0761d02dbd4c31b743"

2
dependabot/Gopkg.toml

@ -1,3 +1,3 @@
[[constraint]]
name = "github.com/mattermost/mattermost-server"
version = "v5.17.1"
version = "v5.17.2"

27
go-backport.patch

@ -1,27 +0,0 @@
From 556e16211ed1b4c146ca2a094688618458182ae7 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Wed, 6 Jun 2018 12:34:56 +0100
Subject: [PATCH] go 1.11 backport
---
store/sqlstore/channel_store.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/store/sqlstore/channel_store.go b/store/sqlstore/channel_store.go
index cf63c706d..dae7c8c9c 100644
--- a/store/sqlstore/channel_store.go
+++ b/store/sqlstore/channel_store.go
@@ -2072,9 +2072,9 @@ func (s SqlChannelStore) SearchAllChannels(term string, opts store.ChannelSearch
likeClause, likeTerm := s.buildLIKEClause(term, "c.Name, c.DisplayName, c.Purpose")
if len(likeTerm) > 0 {
- likeClause = strings.ReplaceAll(likeClause, ":LikeTerm", "'"+likeTerm+"'")
+ likeClause = strings.Replace(likeClause, ":LikeTerm", "'"+likeTerm+"'", -1)
fulltextClause, fulltextTerm := s.buildFulltextClause(term, "c.Name, c.DisplayName, c.Purpose")
- fulltextClause = strings.ReplaceAll(fulltextClause, ":FulltextTerm", "'"+fulltextTerm+"'")
+ fulltextClause = strings.Replace(fulltextClause, ":FulltextTerm", "'"+fulltextTerm+"'", -1)
query = query.Where("(" + likeClause + " OR " + fulltextClause + ")")
}
--
2.11.0
Loading…
Cancel
Save