Bump github.com/mattermost/mattermost-server in /dependabot (#64)

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

Bumps [github.com/mattermost/mattermost-server](https://github.com/mattermost/mattermost-server) from 5.15.1 to 5.16.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.15.1...v5.16.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

.travis.yml

@@ -30,10 +30,7 @@ before_install:
   - docker pull "${DOCKER_IMAGE}"
   - chmod +x build.sh
 script:
-  - f(){ printf ' '; sleep 60; f; }; f &
-  - docker run --interactive=true --mount="type=bind,source=${PWD},destination=${DOCKER_PWD}" --rm=true --tty=true --workdir="${DOCKER_PWD}" -e DEBIAN_RELEASE -e MATTERMOST_RELEASE -e GOOS -e GOARCH "${DOCKER_IMAGE}" ./build.sh > .build.log 2>&1
-after_failure:
-  - tail -n-9000 .build.log
+  - docker run --interactive=true --mount="type=bind,source=${PWD},destination=${DOCKER_PWD}" --rm=true --tty=true --workdir="${DOCKER_PWD}" -e DEBIAN_RELEASE -e MATTERMOST_RELEASE -e GOOS -e GOARCH "${DOCKER_IMAGE}" ./build.sh
 before_deploy:
   - git config --local user.name 'Travis CI'
   - git config --local user.email 'travis@travis-ci.org'

build.sh

@@ -66,8 +66,6 @@ if [ "$(id -u)" -eq 0 ]; then # as root user
 fi
 # as non-root user
 cd "${HOME}"
-# install yarn
-npm install yarn
 # download and extract Mattermost sources
 for COMPONENT in server webapp; do
 	install --directory "${HOME}/go/src/github.com/mattermost/mattermost-${COMPONENT}"
@@ -77,6 +75,9 @@ for COMPONENT in server webapp; do
 		--strip-components=1 --extract --file="mattermost-${COMPONENT}.tar.gz"
 done
 # build Mattermost webapp
+npm set progress false
+sed -i -e 's#--verbose#--display minimal#' \
+	"${HOME}/go/src/github.com/mattermost/mattermost-webapp/package.json"
 make --directory="${HOME}/go/src/github.com/mattermost/mattermost-webapp" \
 	build
 # build Mattermost server
@@ -90,6 +91,12 @@ 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"
 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}" \

dependabot/Gopkg.lock

@@ -17,14 +17,6 @@
   pruneopts = ""
   revision = "816b6608b3c8c1e871bc9cf777f390e2532081fe"
 
-[[projects]]
-  digest = "1:255e3d4847203dc43313d40727f336832a99170226c6136a7b943750b865528e"
-  name = "github.com/go-ldap/ldap"
-  packages = ["."]
-  pruneopts = ""
-  revision = "729c20c2694d870bcd631f0dadaecd088bd7ccbc"
-  version = "v3.0.2"
-
 [[projects]]
   digest = "1:5247b135b5492aa232a731acdcb52b08f32b874cb398f21ab460396eadbe866b"
   name = "github.com/google/uuid"
@@ -50,7 +42,15 @@
   version = "v1.10.0"
 
 [[projects]]
-  digest = "1:24851cf820275c928cd75b29ba0da149777e5924a2cdbd7784434ed2fa694da3"
+  digest = "1:e2df3d086086eadfe8ef94d8f1f333d75b5332987b4c6116f5df8d6bf2a69417"
+  name = "github.com/mattermost/ldap"
+  packages = ["."]
+  pruneopts = ""
+  revision = "fee0a369f21be68ea3d647c0da8272a352fa1528"
+  version = "v3.0.4"
+
+[[projects]]
+  digest = "1:ed4e5f5070c611dc7b90831674194665dfa3041cb092562705f9d91c4254acab"
   name = "github.com/mattermost/mattermost-server"
   packages = [
     "mlog",
@@ -60,8 +60,8 @@
     "utils/markdown",
   ]
   pruneopts = ""
-  revision = "9fecfd5ad41cd2f29fcbf72a842fe594a5d9423a"
-  version = "v5.13.1"
+  revision = "b000d2fbfb2ae8104c890c921c4a518c553b4803"
+  version = "v5.16.1"
 
 [[projects]]
   digest = "1:9fa4a4a684dfb36f3ba1b0a163225140e19e3219e5576d0761d02dbd4c31b743"

dependabot/Gopkg.toml

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

go-backport.patch

@@ -11,17 +11,17 @@ 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
-@@ -2156,9 +2156,9 @@ func (s SqlChannelStore) SearchAllChannels(term string, opts store.ChannelSearch
+@@ -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 + ")")
- 		}
+ 	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