mirror of
https://github.com/SmartHoneybee/ubiquitous-memory
synced 2025-10-25 15:53:48 +02:00
Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f3a313d74b | ||
|
|
d1f0a22e8c | ||
|
|
d91fcfea61 | ||
|
|
dc20b43f6b | ||
|
|
69dd3108db |
@@ -30,10 +30,7 @@ before_install:
|
|||||||
- docker pull "${DOCKER_IMAGE}"
|
- docker pull "${DOCKER_IMAGE}"
|
||||||
- chmod +x build.sh
|
- chmod +x build.sh
|
||||||
script:
|
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
|
||||||
- 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
|
|
||||||
before_deploy:
|
before_deploy:
|
||||||
- git config --local user.name 'Travis CI'
|
- git config --local user.name 'Travis CI'
|
||||||
- git config --local user.email 'travis@travis-ci.org'
|
- git config --local user.email 'travis@travis-ci.org'
|
||||||
|
|||||||
10
build.sh
10
build.sh
@@ -66,8 +66,6 @@ if [ "$(id -u)" -eq 0 ]; then # as root user
|
|||||||
fi
|
fi
|
||||||
# as non-root user
|
# as non-root user
|
||||||
cd "${HOME}"
|
cd "${HOME}"
|
||||||
# install yarn
|
|
||||||
npm install yarn
|
|
||||||
# download and extract Mattermost sources
|
# download and extract Mattermost sources
|
||||||
for COMPONENT in server webapp; do
|
for COMPONENT in server webapp; do
|
||||||
install --directory "${HOME}/go/src/github.com/mattermost/mattermost-${COMPONENT}"
|
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"
|
--strip-components=1 --extract --file="mattermost-${COMPONENT}.tar.gz"
|
||||||
done
|
done
|
||||||
# build Mattermost webapp
|
# 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" \
|
make --directory="${HOME}/go/src/github.com/mattermost/mattermost-webapp" \
|
||||||
build
|
build
|
||||||
# build Mattermost server
|
# build Mattermost server
|
||||||
@@ -90,6 +91,11 @@ patch --directory="${HOME}/go/src/github.com/mattermost/mattermost-server" \
|
|||||||
--strip=1 < "${HOME}/build-release.patch"
|
--strip=1 < "${HOME}/build-release.patch"
|
||||||
patch --directory="${HOME}/go/src/github.com/mattermost/mattermost-server" \
|
patch --directory="${HOME}/go/src/github.com/mattermost/mattermost-server" \
|
||||||
--strip=1 < "${HOME}/go-backport.patch"
|
--strip=1 < "${HOME}/go-backport.patch"
|
||||||
|
sed -i \
|
||||||
|
-e 's#go generate#env --unset=GOOS --unset=GOARCH &#' \
|
||||||
|
-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" \
|
make --directory="${HOME}/go/src/github.com/mattermost/mattermost-server" \
|
||||||
config-reset build-linux package-linux \
|
config-reset build-linux package-linux \
|
||||||
BUILD_NUMBER="dev-$(go env GOOS)-$(go env GOARCH)-${MATTERMOST_RELEASE}" \
|
BUILD_NUMBER="dev-$(go env GOOS)-$(go env GOARCH)-${MATTERMOST_RELEASE}" \
|
||||||
|
|||||||
6
dependabot/Gopkg.lock
generated
6
dependabot/Gopkg.lock
generated
@@ -50,7 +50,7 @@
|
|||||||
version = "v1.10.0"
|
version = "v1.10.0"
|
||||||
|
|
||||||
[[projects]]
|
[[projects]]
|
||||||
digest = "1:1029ff6d4f99257d985b07b70d492dc8a9e33cc577bc5403444277efc5328b1d"
|
digest = "1:3101b3fac6092ae63a4dee90fba080d7e08f8546d0985b6cc9d277cdf23c3fe8"
|
||||||
name = "github.com/mattermost/mattermost-server"
|
name = "github.com/mattermost/mattermost-server"
|
||||||
packages = [
|
packages = [
|
||||||
"mlog",
|
"mlog",
|
||||||
@@ -60,8 +60,8 @@
|
|||||||
"utils/markdown",
|
"utils/markdown",
|
||||||
]
|
]
|
||||||
pruneopts = ""
|
pruneopts = ""
|
||||||
revision = "f8469de7724a9449b43b514a99acefaf02430ad9"
|
revision = "817ee89711bf26d33f840ce7f59fba14da1ed168"
|
||||||
version = "v5.13.0"
|
version = "v5.14.2"
|
||||||
|
|
||||||
[[projects]]
|
[[projects]]
|
||||||
digest = "1:9fa4a4a684dfb36f3ba1b0a163225140e19e3219e5576d0761d02dbd4c31b743"
|
digest = "1:9fa4a4a684dfb36f3ba1b0a163225140e19e3219e5576d0761d02dbd4c31b743"
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
[[constraint]]
|
[[constraint]]
|
||||||
name = "github.com/mattermost/mattermost-server"
|
name = "github.com/mattermost/mattermost-server"
|
||||||
version = "v5.13.0"
|
version = "v5.14.2"
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ diff --git a/store/sqlstore/channel_store.go b/store/sqlstore/channel_store.go
|
|||||||
index cf63c706d..dae7c8c9c 100644
|
index cf63c706d..dae7c8c9c 100644
|
||||||
--- a/store/sqlstore/channel_store.go
|
--- a/store/sqlstore/channel_store.go
|
||||||
+++ b/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")
|
likeClause, likeTerm := s.buildLIKEClause(term, "c.Name, c.DisplayName, c.Purpose")
|
||||||
if len(likeTerm) > 0 {
|
if len(likeTerm) > 0 {
|
||||||
|
|||||||
Reference in New Issue
Block a user