mirror of
https://github.com/SmartHoneybee/ubiquitous-memory
synced 2025-10-24 15:23:49 +02:00
Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9b16070789 | ||
|
|
ab54cd5f53 | ||
|
|
0e12504498 | ||
|
|
4e3ab42325 | ||
|
|
44df1cad21 | ||
|
|
0f76d17e4b | ||
|
|
b825885790 | ||
|
|
1aab309dbe | ||
|
|
b0e13adaec | ||
|
|
6af28466ed | ||
|
|
423a1fc7a4 | ||
|
|
f3a313d74b |
@@ -5,7 +5,7 @@ service:
|
||||
- docker
|
||||
env:
|
||||
global:
|
||||
- DEBIAN_RELEASE='stretch'
|
||||
- DEBIAN_RELEASE='buster'
|
||||
- DOCKER_PWD='/root'
|
||||
- DOCKER_IMAGE="debian:${DEBIAN_RELEASE}"
|
||||
matrix:
|
||||
|
||||
23
build.sh
23
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,13 +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 &#' \
|
||||
-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}" \
|
||||
|
||||
22
dependabot/Gopkg.lock
generated
22
dependabot/Gopkg.lock
generated
@@ -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:3101b3fac6092ae63a4dee90fba080d7e08f8546d0985b6cc9d277cdf23c3fe8"
|
||||
digest = "1:e2df3d086086eadfe8ef94d8f1f333d75b5332987b4c6116f5df8d6bf2a69417"
|
||||
name = "github.com/mattermost/ldap"
|
||||
packages = ["."]
|
||||
pruneopts = ""
|
||||
revision = "fee0a369f21be68ea3d647c0da8272a352fa1528"
|
||||
version = "v3.0.4"
|
||||
|
||||
[[projects]]
|
||||
digest = "1:75c32be0ba2d885c98345eba1d8e74b7c04cb74b9672c27849e71800f18090ee"
|
||||
name = "github.com/mattermost/mattermost-server"
|
||||
packages = [
|
||||
"mlog",
|
||||
@@ -60,8 +60,8 @@
|
||||
"utils/markdown",
|
||||
]
|
||||
pruneopts = ""
|
||||
revision = "817ee89711bf26d33f840ce7f59fba14da1ed168"
|
||||
version = "v5.14.1"
|
||||
revision = "35ea48a071f2837d30217cefb2de7d7855fe7f77"
|
||||
version = "v5.17.3"
|
||||
|
||||
[[projects]]
|
||||
digest = "1:9fa4a4a684dfb36f3ba1b0a163225140e19e3219e5576d0761d02dbd4c31b743"
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
[[constraint]]
|
||||
name = "github.com/mattermost/mattermost-server"
|
||||
version = "v5.14.1"
|
||||
version = "v5.19.1"
|
||||
|
||||
@@ -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
|
||||
Reference in New Issue
Block a user