mirror of
				https://github.com/SmartHoneybee/ubiquitous-memory
				synced 2025-10-25 15:53:48 +02:00 
			
		
		
		
	Compare commits
	
		
			21 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | 8bfcbc152c | ||
|  | ea209b1cb4 | ||
|  | a4963df160 | ||
|  | 2c62ab2b0e | ||
|  | 85cb4319c0 | ||
|  | da7d3b0da6 | ||
|  | d9d94c2ee9 | ||
|  | 8e4b90726c | ||
|  | 0fc1ecee72 | ||
|  | 4f364878e5 | ||
|  | a84d8e49ab | ||
|  | 81b4106fc7 | ||
|  | f92e152276 | ||
|  | df047ff1c3 | ||
|  | 34f7ec2895 | ||
|  | 04f32e9214 | ||
|  | e4b062a7f4 | ||
|  | fae0f5b8b6 | ||
|  | 608535bba2 | ||
|  | 1ff3276ef1 | ||
|  | 9b99cea31b | 
							
								
								
									
										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 | ||||
| @@ -8,6 +8,7 @@ env: | ||||
|     - DEBIAN_RELEASE='buster' | ||||
|     - DOCKER_PWD='/root' | ||||
|     - DOCKER_IMAGE="debian:${DEBIAN_RELEASE}" | ||||
|     - GO_VERSION='1.15.5' | ||||
|   matrix: | ||||
|     - GOOS='dragonfly' GOARCH='amd64' | ||||
|     - GOOS='freebsd' GOARCH='amd64' | ||||
|   | ||||
| @@ -1,17 +1,17 @@ | ||||
| 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 3e9a11339..c8bd5409f 100644 | ||||
| --- a/build/release.mk | ||||
| +++ b/build/release.mk | ||||
| @@ -77,7 +77,7 @@ endif | ||||
| @@ -97,7 +97,7 @@ package: | ||||
|  	cp -RL $(BUILD_WEBAPP_DIR)/dist/* $(DIST_PATH)/client | ||||
|   | ||||
|  	@#Download MMCTL | ||||
| -	scripts/download_mmctl_release.sh "" $(DIST_PATH)/bin | ||||
| +	#scripts/download_mmctl_release.sh "" $(DIST_PATH)/bin | ||||
|   | ||||
|  	@# Help files | ||||
|  ifeq ($(BUILD_ENTERPRISE_READY),true) | ||||
| @@ -126,7 +126,7 @@ endif | ||||
|   | ||||
|   | ||||
|  	@# ----- PLATFORM SPECIFIC ----- | ||||
| @@ -20,7 +20,7 @@ index 238343e..1b7859f 100644 | ||||
|  	@# Make osx package | ||||
|  	@# Copy binary | ||||
|  ifeq ($(BUILDER_GOOS_GOARCH),"darwin_amd64") | ||||
| @@ -145,7 +145,7 @@ endif | ||||
| @@ -196,7 +196,7 @@ endif | ||||
|  	rm -f $(DIST_PATH)/bin/platform.exe | ||||
|  	rm -f $(DIST_PATH)/bin/mmctl.exe | ||||
|  	rm -f $(DIST_PATH)/prepackaged_plugins/* | ||||
| @@ -29,14 +29,12 @@ index 238343e..1b7859f 100644 | ||||
|  	@# Make linux package | ||||
|  	@# Copy binary | ||||
|  ifeq ($(BUILDER_GOOS_GOARCH),"linux_amd64") | ||||
| @@ -155,7 +155,7 @@ else | ||||
|  	cp $(GOPATH)/bin/linux_amd64/mattermost $(DIST_PATH)/bin # from cross-compiled bin dir | ||||
|  	cp $(GOPATH)/bin/linux_amd64/platform $(DIST_PATH)/bin # from cross-compiled bin dir | ||||
| @@ -207,7 +207,7 @@ else | ||||
|  	cp $(GOBIN)/linux_amd64/platform $(DIST_PATH)/bin # from cross-compiled bin dir | ||||
|  endif | ||||
| -	MMCTL_FILE="linux_amd64.tar" && curl -f -O -L https://github.com/mattermost/mmctl/releases/download/$(MMCTL_REL_TO_DOWNLOAD)/$$MMCTL_FILE && tar -xvf $$MMCTL_FILE -C $(DIST_PATH)/bin && rm $$MMCTL_FILE | ||||
| + | ||||
|  	#Download MMCTL for Linux | ||||
| -	scripts/download_mmctl_release.sh "Linux" $(DIST_PATH)/bin | ||||
| +	#scripts/download_mmctl_release.sh "Linux" $(DIST_PATH)/bin | ||||
|  	@# Prepackage plugins | ||||
|  	@for plugin_package in $(PLUGIN_PACKAGES) ; do \ | ||||
|  		ARCH="linux-amd64"; \ | ||||
| --  | ||||
| 2.11.0 | ||||
|   | ||||
							
								
								
									
										15
									
								
								build.sh
									
									
									
									
									
								
							
							
						
						
									
										15
									
								
								build.sh
									
									
									
									
									
								
							| @@ -10,6 +10,8 @@ MATTERMOST_RELEASE="${MATTERMOST_RELEASE:-v5.4.0}" | ||||
| # node key id and release | ||||
| NODE_KEY="${NODE_KEY:-9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280}" | ||||
| NODE_RELEASE="${NODE_RELEASE:-10}" | ||||
| # golang version | ||||
| GO_VERSION="${GO_VERSION:-1.15.5}" | ||||
|  | ||||
| if [ "$(id -u)" -eq 0 ]; then # as root user | ||||
| 	# create build user, if needed | ||||
| @@ -43,15 +45,18 @@ 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)" | ||||
| @@ -65,6 +70,8 @@ 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}" | ||||
| # download and extract Mattermost sources | ||||
| for COMPONENT in server webapp; do | ||||
| @@ -88,7 +95,7 @@ if [ "$(go env GOOS)_$(go env GOARCH)" != 'linux_amd64' ]; then | ||||
| 		"${HOME}/go/bin/linux_amd64" | ||||
| fi | ||||
| patch --directory="${HOME}/go/src/github.com/mattermost/mattermost-server" \ | ||||
| 	--strip=1 < "${HOME}/build-release.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#' \ | ||||
|   | ||||
| @@ -1,3 +1,3 @@ | ||||
| module github.com/SmartHoneybee/ubiquitous-memory/dependabot | ||||
|  | ||||
| require github.com/mattermost/mattermost-server/v5 v5.25.0 | ||||
| require github.com/mattermost/mattermost-server/v5 v5.34.2 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user