mirror of
				https://github.com/SmartHoneybee/ubiquitous-memory
				synced 2025-10-25 15:53:48 +02:00 
			
		
		
		
	Compare commits
	
		
			75 Commits
		
	
	
		
			v5.12.2
			...
			fix-depend
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | 304ed7d646 | ||
|  | cef04b0488 | ||
|  | f3aa038f93 | ||
|  | ce52eca004 | ||
|  | 06ac371c53 | ||
|  | a55b21d6e7 | ||
|  | ca9c6e47c5 | ||
|  | 89f37ddd12 | ||
|  | a5c6a921e2 | ||
|  | 02f1846b2b | ||
|  | 362f5cf97f | ||
|  | 4b09124333 | ||
|  | 7332922733 | ||
|  | 605dd4992e | ||
|  | f58b2018c4 | ||
|  | f1204f044c | ||
|  | 43a100f30c | ||
|  | 65f66300ea | ||
|  | 896ca40562 | ||
|  | a3ed63c840 | ||
|  | c3bf7a5e6e | ||
|  | 8bfcbc152c | ||
|  | ea209b1cb4 | ||
|  | a4963df160 | ||
|  | 2c62ab2b0e | ||
|  | 85cb4319c0 | ||
|  | da7d3b0da6 | ||
|  | d9d94c2ee9 | ||
|  | 8e4b90726c | ||
|  | 0fc1ecee72 | ||
|  | 4f364878e5 | ||
|  | a84d8e49ab | ||
|  | 81b4106fc7 | ||
|  | f92e152276 | ||
|  | df047ff1c3 | ||
|  | 34f7ec2895 | ||
|  | 04f32e9214 | ||
|  | e4b062a7f4 | ||
|  | fae0f5b8b6 | ||
|  | 608535bba2 | ||
|  | 1ff3276ef1 | ||
|  | 9b99cea31b | ||
|  | 0f99d5847c | ||
|  | f16cacf3ea | ||
|  | 6ef90eb436 | ||
|  | 06a96e5cdf | ||
|  | f3192dba71 | ||
|  | ca10b305e4 | ||
|  | 475839128e | ||
|  | ec8de37859 | ||
|  | 5e267c639f | ||
|  | 3afd62ebaa | ||
|  | 4449fd0723 | ||
|  | 6f1748b909 | ||
|  | 5e14b05358 | ||
|  | c696751a66 | ||
|  | 9b16070789 | ||
|  | ab54cd5f53 | ||
|  | 0e12504498 | ||
|  | 4e3ab42325 | ||
|  | 44df1cad21 | ||
|  | 0f76d17e4b | ||
|  | b825885790 | ||
|  | 1aab309dbe | ||
|  | b0e13adaec | ||
|  | 6af28466ed | ||
|  | 423a1fc7a4 | ||
|  | f3a313d74b | ||
|  | d1f0a22e8c | ||
|  | d91fcfea61 | ||
|  | dc20b43f6b | ||
|  | 69dd3108db | ||
|  | ec85f8e9bf | ||
|  | 793ea4bec3 | ||
|  | 5395cf700d | 
							
								
								
									
										9
									
								
								.github/dependabot.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								.github/dependabot.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,9 @@ | ||||
| version: 2 | ||||
| updates: | ||||
| - package-ecosystem: gomod | ||||
|   directory: "/dependabot" | ||||
|   schedule: | ||||
|     interval: daily | ||||
|     time: "00:15" | ||||
|   open-pull-requests-limit: 99 | ||||
|   target-branch: master | ||||
							
								
								
									
										7
									
								
								.github/lock.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										7
									
								
								.github/lock.yml
									
									
									
									
										vendored
									
									
								
							| @@ -1,7 +0,0 @@ | ||||
| # Configuration for Lock Threads - https://github.com/dessant/lock-threads | ||||
|  | ||||
| # Number of days of inactivity before a closed issue or pull request is locked | ||||
| daysUntilLock: 3 | ||||
|  | ||||
| # Comment to post before locking. Set to `false` to disable | ||||
| lockComment: false | ||||
							
								
								
									
										15
									
								
								.github/workflows/lock.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										15
									
								
								.github/workflows/lock.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,15 @@ | ||||
| name: 'Lock threads' | ||||
|  | ||||
| on: | ||||
|   schedule: | ||||
|     - cron: '0 0 * * *' | ||||
|  | ||||
| jobs: | ||||
|   lock: | ||||
|     runs-on: ubuntu-latest | ||||
|     steps: | ||||
|       - uses: dessant/lock-threads@v2 | ||||
|         with: | ||||
|           github-token: ${{ github.token }} | ||||
|           issue-lock-inactive-days: 3 | ||||
|           pr-lock-inactive-days: 3 | ||||
							
								
								
									
										96
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										96
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,96 @@ | ||||
| name: Package and release | ||||
| on: | ||||
|   push: | ||||
|     branches: [ master ] | ||||
|   pull_request: | ||||
|     branches: [ master ] | ||||
|  | ||||
| env: | ||||
|   DEBIAN_RELEASE: buster | ||||
|   DOCKER_PWD: /root | ||||
|   DOCKER_IMAGE: debian:${DEBIAN_RELEASE} | ||||
|   GO_VERSION: 1.16.7 | ||||
|  | ||||
| jobs: | ||||
|   build: | ||||
|     runs-on: ubuntu-latest | ||||
|     strategy: | ||||
|       matrix: | ||||
|         include: | ||||
|           - os: dragonfly | ||||
|             arch: amd64 | ||||
|           - os: freebsd | ||||
|             arch: amd64 | ||||
|           - os: freebsd | ||||
|             arch: arm | ||||
|           - os: linux | ||||
|             arch: arm | ||||
|           - os: linux | ||||
|             arch: arm64 | ||||
|           - os: linux | ||||
|             arch: mips | ||||
|           - os: linux | ||||
|             arch: mips64 | ||||
|           - os: linux | ||||
|             arch: mips64le | ||||
|           - os: linux | ||||
|             arch: mipsle | ||||
|           - os: linux | ||||
|             arch: ppc64 | ||||
|           - os: linux | ||||
|             arch: ppc64le | ||||
|           - os: linux | ||||
|             arch: s390x | ||||
|           - os: netbsd | ||||
|             arch: amd64 | ||||
|           - os: netbsd | ||||
|             arch: arm | ||||
|           - os: openbsd | ||||
|             arch: amd64 | ||||
|           - os: openbsd | ||||
|             arch: arm | ||||
|  | ||||
|     steps: | ||||
|       - name: Clone repository | ||||
|         uses: actions/checkout@v2 | ||||
|  | ||||
|       - name: Set environment from runtime properties | ||||
|         run: | | ||||
|           echo "MATTERMOST_RELEASE=$(grep 'mattermost-server' dependabot/go.mod | cut -d' ' -f3)" >> $GITHUB_ENV | ||||
|           echo "MMCTL_RELEASE=$(grep 'mmctl' dependabot/go.mod | cut -d' ' -f3)" >> $GITHUB_ENV | ||||
|  | ||||
|       - name: Pull docker image | ||||
|         run: 'docker pull "${{ env.DOCKER_IMAGE }}"' | ||||
|  | ||||
|       - name: Build | ||||
|         env: | ||||
|           GOOS: ${{ matrix.os }} | ||||
|           GOARCH: ${{ matrix.arch }} | ||||
|         run: docker run --mount="type=bind,source=$PWD,destination=${{ env.DOCKER_PWD }}" --rm=true --tty=true --workdir="${{ env.DOCKER_PWD }}" -e DEBIAN_RELEASE -e MATTERMOST_RELEASE -e MMCTL_RELEASE -e GOOS -e GOARCH "${{ env.DOCKER_IMAGE }}" ./build.sh | ||||
|  | ||||
|       - name: Tag release | ||||
|         if: github.ref == 'refs/heads/master' | ||||
|         uses: actions/github-script@v3 | ||||
|         # this throws an error if the tag already exists. can't find a way around that without writing our own Github REST client or forking github's scripts repo. | ||||
|         # would prefer to do this before any of these jobs run, but we need to know the mattermost version which only happens after a clone. could potentially | ||||
|         # setup a separate job which does clone + tag, but felt like this was "good enough" for now. | ||||
|         continue-on-error: true | ||||
|         with: | ||||
|           script: | | ||||
|             github.git.createRef({ | ||||
|               owner: context.repo.owner, | ||||
|               repo: context.repo.repo, | ||||
|               ref: 'refs/tags/${{ env.MATTERMOST_RELEASE }}', | ||||
|               sha: context.sha | ||||
|             }) | ||||
|  | ||||
|       - name: Create Github release | ||||
|         if: github.ref == 'refs/heads/master' | ||||
|         uses: softprops/action-gh-release@v1 | ||||
|         env: | ||||
|           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||||
|         with: | ||||
|           tag_name: ${{ env.MATTERMOST_RELEASE }} | ||||
|           files: | | ||||
|             mattermost-${{ env.MATTERMOST_RELEASE }}-${{ matrix.os }}-${{ matrix.arch }}.tar.gz | ||||
|             mattermost-${{ env.MATTERMOST_RELEASE }}-${{ matrix.os }}-${{ matrix.arch }}.tar.gz.sha512sum | ||||
							
								
								
									
										47
									
								
								.travis.yml
									
									
									
									
									
								
							
							
						
						
									
										47
									
								
								.travis.yml
									
									
									
									
									
								
							| @@ -1,47 +0,0 @@ | ||||
| language: c | ||||
| dist: trusty | ||||
| sudo: required | ||||
| service: | ||||
|   - docker | ||||
| env: | ||||
|   global: | ||||
|     - DEBIAN_RELEASE='stretch' | ||||
|     - DOCKER_PWD='/root' | ||||
|     - DOCKER_IMAGE="debian:${DEBIAN_RELEASE}" | ||||
|   matrix: | ||||
|     - GOOS='dragonfly' GOARCH='amd64' | ||||
|     - GOOS='freebsd' GOARCH='amd64' | ||||
|     - GOOS='freebsd' GOARCH='arm' | ||||
|     - GOOS='linux' GOARCH='arm' | ||||
|     - GOOS='linux' GOARCH='arm64' | ||||
|     - GOOS='linux' GOARCH='mips' | ||||
|     - GOOS='linux' GOARCH='mips64' | ||||
|     - GOOS='linux' GOARCH='mips64le' | ||||
|     - GOOS='linux' GOARCH='mipsle' | ||||
|     - GOOS='linux' GOARCH='ppc64' | ||||
|     - GOOS='linux' GOARCH='ppc64le' | ||||
|     - GOOS='linux' GOARCH='s390x' | ||||
|     - GOOS='netbsd' GOARCH='amd64' | ||||
|     - GOOS='netbsd' GOARCH='arm' | ||||
|     - GOOS='openbsd' GOARCH='amd64' | ||||
|     - GOOS='openbsd' GOARCH='arm' | ||||
| before_install: | ||||
|   - export MATTERMOST_RELEASE="$(grep 'version' dependabot/Gopkg.toml | cut -d'"' -f2)" | ||||
|   - 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 | ||||
| before_deploy: | ||||
|   - git config --local user.name 'Travis CI' | ||||
|   - git config --local user.email 'travis@travis-ci.org' | ||||
|   - git tag "${MATTERMOST_RELEASE}" || true | ||||
| deploy: | ||||
|   provider: releases | ||||
|   api_key: "${GITHUB_OAUTH_TOKEN}" | ||||
|   file: | ||||
|     - "${TRAVIS_BUILD_DIR}/mattermost-${MATTERMOST_RELEASE}-${GOOS}-${GOARCH}.tar.gz" | ||||
|     - "${TRAVIS_BUILD_DIR}/mattermost-${MATTERMOST_RELEASE}-${GOOS}-${GOARCH}.tar.gz.sha512sum" | ||||
|   skip_cleanup: true | ||||
| @@ -1,9 +1,9 @@ | ||||
| # ubiquitous-memory: [Here be dragons][2] | ||||
|  | ||||
| [](https://travis-ci.org/SmartHoneybee/ubiquitous-memory) | ||||
| [](https://github.com/SmartHoneybee/ubiquitous-memory/actions/workflows/release.yml) | ||||
|  | ||||
| [Travis CI][0] recipe that builds [Mattermost][1] for various operating systems and architectures. | ||||
| [Github Actions][0] script that builds [Mattermost][1] for various operating systems and architectures. | ||||
|  | ||||
| [0]: https://travis-ci.org/SmartHoneybee/ubiquitous-memory | ||||
| [0]: https://github.com/SmartHoneybee/ubiquitous-memory/actions | ||||
| [1]: https://mattermost.com/ | ||||
| [2]: https://en.wikipedia.org/wiki/Here_be_dragons | ||||
|   | ||||
| @@ -1,33 +1,22 @@ | ||||
| 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] Split make goal | ||||
|  | ||||
| --- | ||||
|  build/release.mk | 4 ++-- | ||||
|  1 file changed, 2 insertions(+), 2 deletions(-) | ||||
|  | ||||
| diff --git a/build/release.mk b/build/release.mk | ||||
| index 238343e..1b7859f 100644 | ||||
| index 7f989d4b4..886119275 100644 | ||||
| --- a/build/release.mk | ||||
| +++ b/build/release.mk | ||||
| @@ -70,7 +70,7 @@ endif | ||||
|  	done | ||||
|   | ||||
|  	@# ----- PLATFORM SPECIFIC ----- | ||||
| - | ||||
| +_: | ||||
|  	@# Make osx package | ||||
|  	@# Copy binary | ||||
|  ifeq ($(BUILDER_GOOS_GOARCH),"darwin_amd64") | ||||
| @@ -110,7 +110,7 @@ endif | ||||
|  	rm -f $(DIST_PATH)/bin/mattermost.exe | ||||
|  	rm -f $(DIST_PATH)/bin/platform.exe | ||||
|  	rm -f $(DIST_PATH)/prepackaged_plugins/* | ||||
| - | ||||
| +package-linux: package | ||||
|  	@# Make linux package | ||||
|  	@# Copy binary | ||||
|  ifeq ($(BUILDER_GOOS_GOARCH),"linux_amd64") | ||||
| --  | ||||
| 2.11.0 | ||||
| @@ -71,7 +71,7 @@ package-prep: | ||||
|  	@# Resource directories | ||||
|  	mkdir -p $(DIST_PATH)/config | ||||
|  	cp -L config/README.md $(DIST_PATH)/config | ||||
| -	OUTPUT_CONFIG=$(PWD)/$(DIST_PATH)/config/config.json go run ./scripts/config_generator | ||||
| +	OUTPUT_CONFIG=$(PWD)/$(DIST_PATH)/config/config.json GOOS= GOARCH= go run ./scripts/config_generator | ||||
|  	cp -RL fonts $(DIST_PATH) | ||||
|  	cp -RL templates $(DIST_PATH) | ||||
|  	rm -rf $(DIST_PATH)/templates/*.mjml $(DIST_PATH)/templates/partials/ | ||||
| @@ -201,7 +201,7 @@ else | ||||
|  	cp $(GOBIN)/linux_amd64/mattermost $(DIST_PATH_LIN)/bin # from cross-compiled bin dir | ||||
|  endif | ||||
|  	#Download MMCTL for Linux | ||||
| -	scripts/download_mmctl_release.sh "Linux" $(DIST_PATH_LIN)/bin | ||||
| +	cp "${HOME}/go/src/github.com/mattermost/mmctl/mmctl" $(DIST_PATH_LIN)/bin | ||||
|  	@# Prepackage plugins | ||||
|  	@for plugin_package in $(PLUGIN_PACKAGES) ; do \ | ||||
|  		ARCH="linux-amd64"; \ | ||||
|   | ||||
							
								
								
									
										69
									
								
								build.sh
									
									
									
									
									
										
										
										Normal file → Executable file
									
								
							
							
						
						
									
										69
									
								
								build.sh
									
									
									
									
									
										
										
										Normal file → Executable file
									
								
							| @@ -6,10 +6,13 @@ BUILD_USER_NAME="${BUILD_USER_NAME:-build}" | ||||
| # Debian release used during build | ||||
| DEBIAN_RELEASE="${DEBIAN_RELEASE:-stretch}" | ||||
| # Mattermost version to build | ||||
| MATTERMOST_RELEASE="${MATTERMOST_RELEASE:-v5.4.0}" | ||||
| MATTERMOST_RELEASE="${MATTERMOST_RELEASE:-v5.26.0}" | ||||
| MMCTL_RELEASE="${MMCTL_RELEASE:-v5.26.0}" | ||||
| # node key id and release | ||||
| NODE_KEY="${NODE_KEY:-9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280}" | ||||
| NODE_RELEASE="${NODE_RELEASE:-10}" | ||||
| # golang version | ||||
| GO_VERSION="${GO_VERSION:-1.16.7}" | ||||
|  | ||||
| if [ "$(id -u)" -eq 0 ]; then # as root user | ||||
| 	# create build user, if needed | ||||
| @@ -31,9 +34,9 @@ if [ "$(id -u)" -eq 0 ]; then # as root user | ||||
| 	apt-get update | ||||
| 	# dependencies to setup repositories | ||||
| 	apt-get install --quiet \ | ||||
| 		gnupg2 dirmngr apt-transport-https ca-certificates parallel | ||||
| 	# 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}" | ||||
| 		gnupg2 dirmngr apt-transport-https ca-certificates curl | ||||
| 	# receive missing key | ||||
| 	curl -fsSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - | ||||
| 	# 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" | ||||
| @@ -43,19 +46,22 @@ if [ "$(id -u)" -eq 0 ]; then # as root user | ||||
| 		> '/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 dependencies | ||||
| 	apt-get install --quiet \ | ||||
| 		wget build-essential patch git nodejs | ||||
| 	# install 'pngquant' build dependencies (required by node module) | ||||
| 	apt-get build-dep --quiet \ | ||||
| 		pngquant | ||||
| 	# install go from golang.org | ||||
| 	wget https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz | ||||
| 	tar -xvf go${GO_VERSION}.linux-amd64.tar.gz | ||||
| 	mv go /usr/local | ||||
| 	export GOROOT=/usr/local/go | ||||
| 	export PATH=$GOROOT/bin:$PATH | ||||
| 	# FIXME go (executed by build user) writes to GOROOT | ||||
| 	install --directory --owner="${BUILD_USER_NAME}" \ | ||||
| 		"$(go env GOROOT)/pkg/$(go env GOOS)_$(go env GOARCH)" | ||||
| 	# switch to build user | ||||
| 	# Re-invoke this build.sh script with the 'build' user | ||||
| 	runuser -u "${BUILD_USER_NAME}" -- "${0}" | ||||
| 	# salvage build artifacts | ||||
| 	cp --verbose \ | ||||
| @@ -65,9 +71,9 @@ if [ "$(id -u)" -eq 0 ]; then # as root user | ||||
| 	exit 0 | ||||
| fi | ||||
| # as non-root user | ||||
| export GOROOT=/usr/local/go | ||||
| export PATH=$GOROOT/bin:$PATH | ||||
| 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}" | ||||
| @@ -76,22 +82,49 @@ for COMPONENT in server webapp; do | ||||
| 	tar --directory="${HOME}/go/src/github.com/mattermost/mattermost-${COMPONENT}" \ | ||||
| 		--strip-components=1 --extract --file="mattermost-${COMPONENT}.tar.gz" | ||||
| done | ||||
| # build Mattermost webapp | ||||
| make --directory="${HOME}/go/src/github.com/mattermost/mattermost-webapp" \ | ||||
| 	build | ||||
| # build Mattermost server | ||||
| # prepare the go build environment | ||||
| install --directory "${HOME}/go/bin" | ||||
| if [ "$(go env GOOS)_$(go env GOARCH)" != 'linux_amd64' ]; then | ||||
| 	ln --symbolic \ | ||||
| 		"${HOME}/go/bin/$(go env GOOS)_$(go env GOARCH)" \ | ||||
| 		"${HOME}/go/bin/linux_amd64" | ||||
| fi | ||||
| # build mmctl | ||||
| install --directory "${HOME}/go/src/github.com/mattermost/mmctl" | ||||
| wget --quiet --continue --output-document="mmctl.tar.gz" \ | ||||
| 	"https://github.com/mattermost/mmctl/archive/${MMCTL_RELEASE}.tar.gz" | ||||
| tar --directory="${HOME}/go/src/github.com/mattermost/mmctl" \ | ||||
| 	--strip-components=1 --extract --file="mmctl.tar.gz" | ||||
| find "${HOME}/go/src/github.com/mattermost/mmctl/" -type f -name '*.go' | xargs \ | ||||
| 	sed -i \ | ||||
| 	-e 's#//go:build linux || darwin#//go:build linux || darwin || dragonfly || freebsd || netbsd || openbsd#' \ | ||||
| 	-e 's#// +build linux darwin#// +build linux darwin dragonfly freebsd netbsd openbsd#' | ||||
| make --directory="${HOME}/go/src/github.com/mattermost/mmctl" \ | ||||
| 	BUILD_NUMBER="dev-$(go env GOOS)-$(go env GOARCH)-${MMCTL_RELEASE}" \ | ||||
| 	ADVANCED_VET=0 \ | ||||
| 	GO="GOARCH= GOOS= $(command -v go)" | ||||
| # 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 | ||||
| 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" | ||||
| 	--strip=1 -t < "${HOME}/build-release.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 \ | ||||
| 	config-reset \ | ||||
| 	BUILD_NUMBER="dev-$(go env GOOS)-$(go env GOARCH)-${MATTERMOST_RELEASE}" \ | ||||
| 	GO="GOARCH= GOOS= $(command -v go)" \ | ||||
| 	PLUGIN_PACKAGES='' | ||||
| make --directory="${HOME}/go/src/github.com/mattermost/mattermost-server" \ | ||||
| 	build-linux package-linux \ | ||||
| 	BUILD_NUMBER="dev-$(go env GOOS)-$(go env GOARCH)-${MATTERMOST_RELEASE}" \ | ||||
| 	GO="GOARCH=$(go env GOARCH) GOOS=$(go env GOOS) $(command -v go)" \ | ||||
| 	PLUGIN_PACKAGES='' | ||||
|   | ||||
							
								
								
									
										197
									
								
								dependabot/Gopkg.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										197
									
								
								dependabot/Gopkg.lock
									
									
									
										generated
									
									
									
								
							| @@ -1,197 +0,0 @@ | ||||
| # This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. | ||||
|  | ||||
|  | ||||
| [[projects]] | ||||
|   digest = "1:79421244ba5848aae4b0a5c41e633a04e4894cb0b164a219dc8c15ec7facb7f1" | ||||
|   name = "github.com/blang/semver" | ||||
|   packages = ["."] | ||||
|   pruneopts = "" | ||||
|   revision = "2ee87856327ba09384cabd113bc6b5d174e9ec0f" | ||||
|   version = "v3.5.1" | ||||
|  | ||||
| [[projects]] | ||||
|   branch = "master" | ||||
|   digest = "1:b89d54b3534c2a85153cc60a39e1a9764f9cc6c7b3d1b31265fd53cd70ea77dd" | ||||
|   name = "github.com/dyatlov/go-opengraph" | ||||
|   packages = ["opengraph"] | ||||
|   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" | ||||
|   packages = ["."] | ||||
|   pruneopts = "" | ||||
|   revision = "d460ce9f8df2e77fb1ba55ca87fafed96c607494" | ||||
|   version = "v1.0.0" | ||||
|  | ||||
| [[projects]] | ||||
|   branch = "master" | ||||
|   digest = "1:ad21af51a0276292e9f6f5c37b966630138986478b1ecdbb94b907168fe25281" | ||||
|   name = "github.com/gorilla/websocket" | ||||
|   packages = ["."] | ||||
|   pruneopts = "" | ||||
|   revision = "483fb8d7c32fcb4b5636cd293a92e3935932e2f4" | ||||
|  | ||||
| [[projects]] | ||||
|   digest = "1:9fa4a4a684dfb36f3ba1b0a163225140e19e3219e5576d0761d02dbd4c31b743" | ||||
|   name = "github.com/mattermost/go-i18n" | ||||
|   packages = ["i18n"] | ||||
|   pruneopts = "" | ||||
|   revision = "0dc1626d56435e9d605a29875701721c54bc9bbd" | ||||
|   version = "v1.10.0" | ||||
|  | ||||
| [[projects]] | ||||
|   digest = "1:339ac7aa36a13705fef0c4b04e6e4a33d9d47d2e1ad3607cbb78536386210c33" | ||||
|   name = "github.com/mattermost/mattermost-server" | ||||
|   packages = [ | ||||
|     "mlog", | ||||
|     "model", | ||||
|     "services/timezones", | ||||
|     "utils/jsonutils", | ||||
|     "utils/markdown", | ||||
|   ] | ||||
|   pruneopts = "" | ||||
|   revision = "634a2a8f1bd26593f66515296c79145ca18129be" | ||||
|   version = "v5.12.2" | ||||
|  | ||||
| [[projects]] | ||||
|   digest = "1:9fa4a4a684dfb36f3ba1b0a163225140e19e3219e5576d0761d02dbd4c31b743" | ||||
|   name = "github.com/nicksnyder/go-i18n" | ||||
|   packages = [ | ||||
|     "i18n/bundle", | ||||
|     "i18n/language", | ||||
|     "i18n/translation", | ||||
|   ] | ||||
|   pruneopts = "" | ||||
|   revision = "0dc1626d56435e9d605a29875701721c54bc9bbd" | ||||
|   version = "v1.10.0" | ||||
|  | ||||
| [[projects]] | ||||
|   digest = "1:a5484d4fa43127138ae6e7b2299a6a52ae006c7f803d98d717f60abf3e97192e" | ||||
|   name = "github.com/pborman/uuid" | ||||
|   packages = ["."] | ||||
|   pruneopts = "" | ||||
|   revision = "adf5a7427709b9deb95d29d3fa8a2bf9cfd388f1" | ||||
|   version = "v1.2" | ||||
|  | ||||
| [[projects]] | ||||
|   digest = "1:894aef961c056b6d85d12bac890bf60c44e99b46292888bfa66caf529f804457" | ||||
|   name = "github.com/pelletier/go-toml" | ||||
|   packages = ["."] | ||||
|   pruneopts = "" | ||||
|   revision = "c01d1270ff3e442a8a57cddc1c92dc1138598194" | ||||
|   version = "v1.2.0" | ||||
|  | ||||
| [[projects]] | ||||
|   digest = "1:7365acd48986e205ccb8652cc746f09c8b7876030d53710ea6ef7d0bd0dcd7ca" | ||||
|   name = "github.com/pkg/errors" | ||||
|   packages = ["."] | ||||
|   pruneopts = "" | ||||
|   revision = "645ef00459ed84a119197bfb8d8205042c6df63d" | ||||
|   version = "v0.8.0" | ||||
|  | ||||
| [[projects]] | ||||
|   digest = "1:74f86c458e82e1c4efbab95233e0cf51b7cc02dc03193be9f62cd81224e10401" | ||||
|   name = "go.uber.org/atomic" | ||||
|   packages = ["."] | ||||
|   pruneopts = "" | ||||
|   revision = "1ea20fb1cbb1cc08cbd0d913a96dead89aa18289" | ||||
|   version = "v1.3.2" | ||||
|  | ||||
| [[projects]] | ||||
|   digest = "1:22c7effcb4da0eacb2bb1940ee173fac010e9ef3c691f5de4b524d538bd980f5" | ||||
|   name = "go.uber.org/multierr" | ||||
|   packages = ["."] | ||||
|   pruneopts = "" | ||||
|   revision = "3c4937480c32f4c13a875a1829af76c98ca3d40a" | ||||
|   version = "v1.1.0" | ||||
|  | ||||
| [[projects]] | ||||
|   digest = "1:246f378f80fba6fcf0f191c486b6613265abd2bc0f2fa55a36b928c67352021e" | ||||
|   name = "go.uber.org/zap" | ||||
|   packages = [ | ||||
|     ".", | ||||
|     "buffer", | ||||
|     "internal/bufferpool", | ||||
|     "internal/color", | ||||
|     "internal/exit", | ||||
|     "zapcore", | ||||
|   ] | ||||
|   pruneopts = "" | ||||
|   revision = "ff33455a0e382e8a81d14dd7c922020b6b5e7982" | ||||
|   version = "v1.9.1" | ||||
|  | ||||
| [[projects]] | ||||
|   branch = "master" | ||||
|   digest = "1:efb97ebbd73c3a7068579327f5d98a17c09f6d8caf1fa3212c506e8bb78126b5" | ||||
|   name = "golang.org/x/crypto" | ||||
|   packages = [ | ||||
|     "bcrypt", | ||||
|     "blowfish", | ||||
|   ] | ||||
|   pruneopts = "" | ||||
|   revision = "4d3f4d9ffa16a13f451c3b2999e9c49e9750bf06" | ||||
|  | ||||
| [[projects]] | ||||
|   branch = "master" | ||||
|   digest = "1:4f7cbb08d72e1163302e2d21415200a7bc281653f5f34eda8a15c0da11a337b0" | ||||
|   name = "golang.org/x/net" | ||||
|   packages = [ | ||||
|     "html", | ||||
|     "html/atom", | ||||
|   ] | ||||
|   pruneopts = "" | ||||
|   revision = "3a22650c66bd7f4fb6d1e8072ffd7b75c8a27898" | ||||
|  | ||||
| [[projects]] | ||||
|   digest = "1:5acd3512b047305d49e8763eef7ba423901e85d5dd2fd1e71778a0ea8de10bd4" | ||||
|   name = "golang.org/x/text" | ||||
|   packages = [ | ||||
|     "internal/gen", | ||||
|     "internal/tag", | ||||
|     "language", | ||||
|     "unicode/cldr", | ||||
|   ] | ||||
|   pruneopts = "" | ||||
|   revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0" | ||||
|   version = "v0.3.0" | ||||
|  | ||||
| [[projects]] | ||||
|   digest = "1:039b95e6ba078fe5a22315dcae7bc9859226ee34672ce9ab01708576bf2abd38" | ||||
|   name = "gopkg.in/asn1-ber.v1" | ||||
|   packages = ["."] | ||||
|   pruneopts = "" | ||||
|   revision = "f715ec2f112d1e4195b827ad68cf44017a3ef2b1" | ||||
|   version = "v1.3" | ||||
|  | ||||
| [[projects]] | ||||
|   digest = "1:11c58e19ff7ce22740423bb933f1ddca3bf575def40d5ac3437ec12871b1648b" | ||||
|   name = "gopkg.in/natefinch/lumberjack.v2" | ||||
|   packages = ["."] | ||||
|   pruneopts = "" | ||||
|   revision = "a96e63847dc3c67d17befa69c303767e2f84e54f" | ||||
|   version = "v2.1" | ||||
|  | ||||
| [[projects]] | ||||
|   digest = "1:f0620375dd1f6251d9973b5f2596228cc8042e887cd7f827e4220bc1ce8c30e2" | ||||
|   name = "gopkg.in/yaml.v2" | ||||
|   packages = ["."] | ||||
|   pruneopts = "" | ||||
|   revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183" | ||||
|   version = "v2.2.1" | ||||
|  | ||||
| [solve-meta] | ||||
|   analyzer-name = "dep" | ||||
|   analyzer-version = 1 | ||||
|   input-imports = ["github.com/mattermost/mattermost-server/model"] | ||||
|   solver-name = "gps-cdcl" | ||||
|   solver-version = 1 | ||||
| @@ -1,3 +0,0 @@ | ||||
| [[constraint]] | ||||
|   name = "github.com/mattermost/mattermost-server" | ||||
|   version = "v5.12.2" | ||||
| @@ -1,3 +1,6 @@ | ||||
| package main | ||||
| import _ "github.com/mattermost/mattermost-server/model" | ||||
| func() main() {/* dummy file */} | ||||
|  | ||||
| import _ "github.com/mattermost/mattermost-server/v6/model" | ||||
| import _ "github.com/mattermost/mmctl/commands" | ||||
|  | ||||
| func main() { /* dummy file */ } | ||||
|   | ||||
							
								
								
									
										6
									
								
								dependabot/go.mod
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								dependabot/go.mod
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,6 @@ | ||||
| module github.com/SmartHoneybee/ubiquitous-memory/dependabot | ||||
|  | ||||
| go 1.16 | ||||
|  | ||||
| require github.com/mattermost/mattermost-server/v6 v6.0.2 | ||||
| require github.com/mattermost/mmctl/v1 v6.0.0 | ||||
| @@ -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 | ||||
| @@ -2156,9 +2156,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