1
0
mirror of https://github.com/SmartHoneybee/ubiquitous-memory synced 2025-10-24 15:23:49 +02:00

Compare commits

...

9 Commits

Author SHA1 Message Date
dependabot[bot]
a5c6a921e2 Bump github.com/mattermost/mattermost-server/v5 from 5.38.0 to 5.38.1 in /dependabot (#129)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-19 13:19:28 +02:00
Pierre de La Morinerie
02f1846b2b Upgrade to 5.38.0 (#128) 2021-08-17 23:09:46 +02:00
parnic-sks
362f5cf97f Update Golang version per Mattermost 5.38.0 release notes (#127)
* Update Golang version per Mattermost 5.38.0 release notes

* Update version formatting to match download filename
2021-08-16 23:56:56 +02:00
Pierre de La Morinerie
4b09124333 Upgrade to 5.37.1 (#126) 2021-08-08 09:08:19 +02:00
Pierre de La Morinerie
7332922733 Upgrade to Mattermost 5.37.0 (#125) 2021-07-15 23:08:18 +02:00
dependabot[bot]
605dd4992e Bump github.com/mattermost/mattermost-server/v5 from 5.36.0 to 5.36.1 in /dependabot (#124)
Bumps [github.com/mattermost/mattermost-server/v5](https://github.com/mattermost/mattermost-server) from 5.36.0 to 5.36.1.
- [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.36.0...v5.36.1)

---
updated-dependencies:
- dependency-name: github.com/mattermost/mattermost-server/v5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-23 08:20:30 +02:00
Pierre de La Morinerie
f58b2018c4 Fix build (#123)
Co-authored-by: parnic-sks <chris@straykitestudios.com>
2021-06-23 07:42:40 +02:00
dependabot[bot]
f1204f044c Bump github.com/mattermost/mattermost-server/v5 from 5.35.2 to 5.36.0 in /dependabot (#121)
* Bump github.com/mattermost/mattermost-server/v5 in /dependabot

Bumps [github.com/mattermost/mattermost-server/v5](https://github.com/mattermost/mattermost-server) from 5.35.2 to 5.36.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.35.2...v5.36.0)

---
updated-dependencies:
- dependency-name: github.com/mattermost/mattermost-server/v5
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

* Fix dependabot auto-updates and update to 5.36.0 correctly

* Move config-reset to its own step

config-reset now (as of 5.36.0) is generated through a `go run` command.
If we pass the usual GOOS/GOARCH combo to this command, it will build
and then try to run an executable that's in a format different from the
host system, which can't succeed. This `go run`s config-reset as a
binary compatible with the host machine, then runs the full build with
the appropriate os/arch combo. All config-reset does is generate a new
config.json for the install anyway.

This make step was refactored in 3681cd3688

* More tweaks to handle new config stuff

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: parnic-sks <chris@straykitestudios.com>
2021-06-16 08:35:08 -05:00
Pierre de La Morinerie
43a100f30c ci: convert github actions matrix to a simple list (#122)
[skip ci]
2021-06-15 22:32:50 +02:00
5 changed files with 47 additions and 61 deletions

View File

@@ -9,74 +9,46 @@ env:
DEBIAN_RELEASE: buster
DOCKER_PWD: /root
DOCKER_IMAGE: debian:${DEBIAN_RELEASE}
GO_VERSION: 1.15.5
GO_VERSION: 1.16
jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
os: [dragonfly, freebsd, linux, netbsd, openbsd]
arch: [amd64, arm, arm64, mips, mips64, mips64le, ppc64, ppc64le, s390x ]
exclude:
include:
- os: dragonfly
arch: amd64
- os: freebsd
arch: amd64
- os: freebsd
arch: arm
- os: dragonfly
- os: linux
arch: arm
- os: linux
arch: arm64
- os: dragonfly
- os: linux
arch: mips
- os: dragonfly
- os: linux
arch: mips64
- os: dragonfly
- os: linux
arch: mips64le
- os: dragonfly
- os: linux
arch: mipsle
- os: linux
arch: ppc64
- os: dragonfly
- os: linux
arch: ppc64le
- os: dragonfly
arch: s390x
- os: freebsd
arch: arm64
- os: freebsd
arch: mips
- os: freebsd
arch: mips64
- os: freebsd
arch: mips64le
- os: freebsd
arch: ppc64
- os: freebsd
arch: ppc64le
- os: freebsd
- os: linux
arch: s390x
- os: netbsd
arch: arm64
arch: amd64
- os: netbsd
arch: mips
- os: netbsd
arch: mips64
- os: netbsd
arch: mips64le
- os: netbsd
arch: ppc64
- os: netbsd
arch: ppc64le
- os: netbsd
arch: s390x
arch: arm
- os: openbsd
arch: arm64
arch: amd64
- os: openbsd
arch: mips
- os: openbsd
arch: mips64
- os: openbsd
arch: mips64le
- os: openbsd
arch: ppc64
- os: openbsd
arch: ppc64le
- os: openbsd
arch: s390x
arch: arm
steps:
- name: Clone repository

View File

@@ -1,8 +1,17 @@
diff --git a/build/release.mk b/build/release.mk
index 3e9a11339..c8bd5409f 100644
index 1530e75c6..befe5c9b7 100644
--- a/build/release.mk
+++ b/build/release.mk
@@ -97,7 +97,7 @@ package:
@@ -76,7 +76,7 @@ package:
@# 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/
@@ -98,7 +98,7 @@ package:
cp -RL $(BUILD_WEBAPP_DIR)/dist/* $(DIST_PATH)/client
@#Download MMCTL
@@ -11,7 +20,7 @@ index 3e9a11339..c8bd5409f 100644
@# Help files
ifeq ($(BUILD_ENTERPRISE_READY),true)
@@ -126,7 +126,7 @@ endif
@@ -127,7 +127,7 @@ endif
@# ----- PLATFORM SPECIFIC -----
@@ -20,7 +29,7 @@ index 3e9a11339..c8bd5409f 100644
@# Make osx package
@# Copy binary
ifeq ($(BUILDER_GOOS_GOARCH),"darwin_amd64")
@@ -196,7 +196,7 @@ endif
@@ -197,7 +197,7 @@ endif
rm -f $(DIST_PATH)/bin/platform.exe
rm -f $(DIST_PATH)/bin/mmctl.exe
rm -f $(DIST_PATH)/prepackaged_plugins/*
@@ -29,7 +38,7 @@ index 3e9a11339..c8bd5409f 100644
@# Make linux package
@# Copy binary
ifeq ($(BUILDER_GOOS_GOARCH),"linux_amd64")
@@ -207,7 +207,7 @@ else
@@ -208,7 +208,7 @@ else
cp $(GOBIN)/linux_amd64/platform $(DIST_PATH)/bin # from cross-compiled bin dir
endif
#Download MMCTL for Linux

View File

@@ -11,7 +11,7 @@ MATTERMOST_RELEASE="${MATTERMOST_RELEASE:-v5.4.0}"
NODE_KEY="${NODE_KEY:-9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280}"
NODE_RELEASE="${NODE_RELEASE:-10}"
# golang version
GO_VERSION="${GO_VERSION:-1.15.5}"
GO_VERSION="${GO_VERSION:-1.16}"
if [ "$(id -u)" -eq 0 ]; then # as root user
# create build user, if needed
@@ -33,9 +33,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"
@@ -103,7 +103,12 @@ sed -i \
"${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=''

View File

@@ -1,3 +1,3 @@
package main
import _ "github.com/mattermost/mattermost-server/model"
import _ "github.com/mattermost/mattermost-server/v5/model"
func main() {/* dummy file */}

View File

@@ -1,3 +1,3 @@
module github.com/SmartHoneybee/ubiquitous-memory/dependabot
require github.com/mattermost/mattermost-server/v5 v5.35.3
require github.com/mattermost/mattermost-server/v5 v5.38.1