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

Compare commits

...

31 Commits

Author SHA1 Message Date
dependabot[bot]
def77fa66d Bump github.com/mattermost/mattermost-server in /dependabot (#49) 2019-05-16 07:12:22 +00:00
dependabot[bot]
ee936bdd8f Bump github.com/mattermost/mattermost-server in /dependabot (#48) 2019-04-17 07:03:45 +00:00
dependabot[bot]
df7a149a4e Bump github.com/mattermost/mattermost-server in /dependabot (#47) 2019-03-17 16:08:18 +00:00
dependabot[bot]
1d503644eb Bump github.com/mattermost/mattermost-server in /dependabot (#46) 2019-02-17 01:36:02 +00:00
dependabot[bot]
0b5dcbb8a7 Bump github.com/mattermost/mattermost-server in /dependabot (#45) 2019-02-03 14:56:47 +00:00
dependabot[bot]
df4840729c Bump github.com/mattermost/mattermost-server (#44) 2019-01-16 07:17:10 +00:00
dependabot[bot]
fcd469daab Bump github.com/mattermost/mattermost-server (#42) 2018-12-20 16:18:22 +00:00
dependabot[bot]
a9d3978d23 Bump github.com/mattermost/mattermost-server from 5.5.1 to 5.6.0 in /dependabot (#41)
* Bump github.com/mattermost/mattermost-server

Bumps [github.com/mattermost/mattermost-server](https://github.com/mattermost/mattermost-server) from 5.5.1 to 5.6.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.5.1...v5.6.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-14 23:59:41 +00:00
dependabot[bot]
12213cc988 Bump github.com/mattermost/mattermost-server (#40) 2018-12-06 12:09:00 +00:00
Bee
d1747432be Update .travis.yml (#39) 2018-11-15 23:13:04 +00:00
Bee
30ae5ae434 dependabot (#38) 2018-11-15 21:43:35 +00:00
Bee
4f58e13ed1 docker pull debian:stretch (#35) 2018-10-16 14:16:10 +00:00
Bee
205431da5a Update .travis.yml (#34) 2018-09-19 09:51:35 +00:00
Bee
62ff5c6c21 Update .travis.yml (#33) 2018-09-14 15:47:08 +00:00
Bee
c602d86ba3 Update .travis.yml (#32) 2018-08-17 19:18:58 +02:00
Bee
f95c324df8 Update .travis.yml (#31) 2018-07-14 17:34:07 +02:00
Bee
27211d5341 Update .travis.yml (#30) 2018-07-11 09:19:47 +02:00
Bee
04a80b8c61 Update .travis.yml (#29) 2018-06-15 19:41:25 +02:00
Bee
cce9a5e9f6 Update .travis.yml (#28) 2018-06-02 17:36:34 +02:00
Bee
4338daa488 Update .travis.yml (#27) 2018-05-16 07:41:25 +02:00
Bee
adfadb5db1 Update .travis.yml (#26) 2018-05-03 23:51:58 +02:00
Bee
9ec2d52a6f Update .travis.yml (#25) 2018-04-27 08:30:19 +02:00
Bee
73a0247466 Update .travis.yml (#24) 2018-04-15 11:28:06 +02:00
Bee
8e48ad9fd6 Update .travis.yml (#23) 2018-03-16 07:59:56 +01:00
Bee
9fbbcc9efa Update .travis.yml (#22) 2018-02-23 11:03:29 +01:00
Bee
a841d22ea1 Update .travis.yml (#21) 2018-02-19 17:50:02 +01:00
Bee
53a8823dd3 Update .travis.yml (#20) 2018-02-16 10:59:36 +01:00
Bee
2b81bf9c79 Update .travis.yml (#19) 2018-02-15 17:43:40 +01:00
Bee
656fcc3022 Update .travis.yml (#18) 2018-01-31 17:31:40 +01:00
Bee
64b4df143a Update .travis.yml (#17) 2018-01-16 08:24:29 +01:00
Bee
6245638306 Update .travis.yml (#16) 2018-01-13 18:30:06 +01:00
8 changed files with 367 additions and 112 deletions

View File

@@ -1,57 +1,47 @@
language: c
dist: trusty
addons:
apt:
sources:
- sourceline: 'deb https://dl.yarnpkg.com/debian/ stable main'
key_url: 'https://dl.yarnpkg.com/debian/pubkey.gpg'
- sourceline: 'deb https://deb.nodesource.com/node_8.x trusty main'
key_url: 'https://deb.nodesource.com/gpgkey/nodesource.gpg.key'
packages:
- nodejs
- yarn
- build-essential
sudo: required
service:
- docker
env:
global:
- GOV=1.9.2
- GOSHA="de874549d9a8d8d8062be05808509c09a88a248e77ec14eb77453530829ac02b go${GOV}.linux-amd64.tar.gz"
- GOPATH=$HOME/go
- GOROOT=$HOME/$GOV/go
- PATH=$GOROOT/bin:$PATH:$GOPATH/bin
- DEBIAN_RELEASE='stretch'
- DOCKER_PWD='/root'
- DOCKER_IMAGE="debian:${DEBIAN_RELEASE}"
matrix:
- V=4.5.0
- 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:
- install -d $GOPATH $GOROOT
- wget https://storage.googleapis.com/golang/go$GOV.linux-amd64.tar.gz
- echo "${GOSHA}" > .gosha
- sha256sum --check .gosha
- tar -C $HOME/$GOV -xzf go$GOV.linux-amd64.tar.gz
- node --version
- yarn versions
- go version
- ulimit -n 8096
- install -d ~/go/src/github.com/mattermost
- cd ~/go/src/github.com/mattermost
- wget "https://github.com/mattermost/mattermost-server/archive/v${V}.tar.gz"
- tar xf "v${V}.tar.gz"
- mv "mattermost-server-${V}" mattermost-server
- rm "v${V}.tar.gz"
- wget "https://github.com/mattermost/mattermost-webapp/archive/v${V}.tar.gz"
- tar xf "v${V}.tar.gz"
- mv "mattermost-webapp-${V}" mattermost-webapp
- rm "v${V}.tar.gz"
- export MATTERMOST_RELEASE="$(grep 'version' dependabot/Gopkg.toml | cut -d'"' -f2)"
- docker pull "${DOCKER_IMAGE}"
- chmod +x build.sh
script:
- make build -C ~/go/src/github.com/mattermost/mattermost-webapp
- cd ~/go/src/github.com/mattermost/mattermost-server
- patch -p1 < $TRAVIS_BUILD_DIR/make.patch
- go get -d ./...
- make build-linux package BUILD_NUMBER="dev-arm-tag${V}"
- mv -v ~/go/src/github.com/mattermost/mattermost-server/dist/mattermost-*-linux-arm.tar.gz $TRAVIS_BUILD_DIR/mattermost-$V-arm.tar.gz
- sha512sum $TRAVIS_BUILD_DIR/mattermost-$V-arm.tar.gz | tee $TRAVIS_BUILD_DIR/mattermost-$V-arm.tar.gz.sha512sum
- 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-$V-arm.tar.gz"
- "$TRAVIS_BUILD_DIR/mattermost-$V-arm.tar.gz.sha512sum"
- "${TRAVIS_BUILD_DIR}/mattermost-${MATTERMOST_RELEASE}-${GOOS}-${GOARCH}.tar.gz"
- "${TRAVIS_BUILD_DIR}/mattermost-${MATTERMOST_RELEASE}-${GOOS}-${GOARCH}.tar.gz.sha512sum"
skip_cleanup: true

View File

@@ -1,10 +1,9 @@
# ubiquitous-memory: [Here be dragons][3]
# ubiquitous-memory: [Here be dragons][2]
[![Build Status](https://travis-ci.org/SmartHoneybee/ubiquitous-memory.svg?branch=master)](https://travis-ci.org/SmartHoneybee/ubiquitous-memory)
[Travis CI][0] recipe that builds [Mattermost][1] for Linux on [ARMv7][2]-compatible devices.
[Travis CI][0] recipe that builds [Mattermost][1] for various operating systems and architectures.
[0]: https://travis-ci.org/SmartHoneybee/ubiquitous-memory
[1]: https://mattermost.com/
[2]: https://github.com/golang/go/wiki/GoArm#supported-architectures
[3]: https://en.wikipedia.org/wiki/Here_be_dragons
[2]: https://en.wikipedia.org/wiki/Here_be_dragons

33
build-release.patch Normal file
View File

@@ -0,0 +1,33 @@
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
--- a/build/release.mk
+++ b/build/release.mk
@@ -66,7 +66,7 @@ endif
done
@# ----- PLATFORM SPECIFIC -----
-
+_:
@# Make osx package
@# Copy binary
ifeq ($(BUILDER_GOOS_GOARCH),"darwin_amd64")
@@ -96,7 +96,7 @@ endif
@# Cleanup
rm -f $(DIST_PATH)/bin/mattermost.exe
rm -f $(DIST_PATH)/bin/platform.exe
-
+package-linux: package
@# Make linux package
@# Copy binary
ifeq ($(BUILDER_GOOS_GOARCH),"linux_amd64")
--
2.11.0

100
build.sh Normal file
View File

@@ -0,0 +1,100 @@
#!/bin/sh
set -eux
# build user
BUILD_USER_HOME="${BUILD_USER_HOME:-/build}"
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}"
# node key id and release
NODE_KEY="${NODE_KEY:-9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280}"
NODE_RELEASE="${NODE_RELEASE:-10}"
if [ "$(id -u)" -eq 0 ]; then # as root user
# create build user, if needed
set +e
if ! id -u "${BUILD_USER_NAME}"; then # create build user
set -e
useradd --create-home --home-dir "${BUILD_USER_HOME}" --skel "${PWD}" \
"${BUILD_USER_NAME}"
fi
set -e
# configure apt
printf 'APT::Install-Recommends "0";' \
> '/etc/apt/apt.conf.d/99-no-install-recommends'
printf 'APT::Install-Suggests "0";' \
> '/etc/apt/apt.conf.d/99-no-install-suggests'
printf 'APT::Get::Assume-Yes "true";' \
> '/etc/apt/apt.conf.d/99-assume-yes'
# update repositories
apt-get update
# dependencies to setup repositories
apt-get install --quiet \
gnupg2 dirmngr apt-transport-https ca-certificates
# receive missing key
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 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 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
# 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
runuser -u "${BUILD_USER_NAME}" -- "${0}"
# salvage build artifacts
cp --verbose \
"${BUILD_USER_HOME}/mattermost-${MATTERMOST_RELEASE}-$(go env GOOS)-$(go env GOARCH).tar.gz" \
"${BUILD_USER_HOME}/mattermost-${MATTERMOST_RELEASE}-$(go env GOOS)-$(go env GOARCH).tar.gz.sha512sum" \
"${HOME}"
exit 0
fi
# as non-root user
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}"
wget --quiet --continue --output-document="mattermost-${COMPONENT}.tar.gz" \
"https://github.com/mattermost/mattermost-${COMPONENT}/archive/${MATTERMOST_RELEASE}.tar.gz"
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
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
patch --directory="${HOME}/go/src/github.com/mattermost/mattermost-server" \
--strip=1 < "${HOME}/build-release.patch"
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}" \
GO="GOARCH=$(go env GOARCH) GOOS=$(go env GOOS) $(command -v go)" \
PLUGIN_PACKAGES=''
# rename archive and calculate its SHA512 sum
mv "${HOME}/go/src/github.com/mattermost/mattermost-server/dist/mattermost-team-linux-amd64.tar.gz" \
"${HOME}/mattermost-${MATTERMOST_RELEASE}-$(go env GOOS)-$(go env GOARCH).tar.gz"
sha512sum "${HOME}/mattermost-${MATTERMOST_RELEASE}-$(go env GOOS)-$(go env GOARCH).tar.gz" | \
tee "${HOME}/mattermost-${MATTERMOST_RELEASE}-$(go env GOOS)-$(go env GOARCH).tar.gz.sha512sum"

190
dependabot/Gopkg.lock generated Normal file
View File

@@ -0,0 +1,190 @@
# 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:fa1e727613a8f6f45e9ef1c9abaef028bce3b345d02a68814d59e21a27eda6ee"
name = "github.com/mattermost/mattermost-server"
packages = [
"mlog",
"model",
"services/timezones",
"utils/jsonutils",
"utils/markdown",
]
pruneopts = ""
revision = "692d1be91eafb64328ce21bcd18671288eb5139b"
version = "v5.11.0"
[[projects]]
digest = "1:9fa4a4a684dfb36f3ba1b0a163225140e19e3219e5576d0761d02dbd4c31b743"
name = "github.com/nicksnyder/go-i18n"
packages = [
"i18n",
"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

3
dependabot/Gopkg.toml Normal file
View File

@@ -0,0 +1,3 @@
[[constraint]]
name = "github.com/mattermost/mattermost-server"
version = "v5.11.0"

3
dependabot/dummy.go Normal file
View File

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

View File

@@ -1,63 +0,0 @@
diff --git a/build/release.mk b/build/release.mk
index 5eaee80..e0e13bf 100644
--- a/build/release.mk
+++ b/build/release.mk
@@ -3,7 +3,7 @@ dist: | check-style test package
build-linux:
@echo Build Linux amd64
- env GOOS=linux GOARCH=amd64 $(GO) install $(GOFLAGS) $(GO_LINKER_FLAGS) ./cmd/platform
+ env GOOS=linux GOARCH=arm GOARM=7 $(GO) install $(GOFLAGS) $(GO_LINKER_FLAGS) ./cmd/platform
build-osx:
@echo Build OSX amd64
@@ -32,6 +32,7 @@ package:
@# Resource directories
cp -RL config $(DIST_PATH)
+ mv $(DIST_PATH)/config/default.json $(DIST_PATH)/config/config.json
cp -RL fonts $(DIST_PATH)
cp -RL templates $(DIST_PATH)
cp -RL i18n $(DIST_PATH)
@@ -61,38 +62,14 @@ endif
@# ----- PLATFORM SPECIFIC -----
- @# Make osx package
- @# Copy binary
-ifeq ($(BUILDER_GOOS_GOARCH),"darwin_amd64")
- cp $(GOPATH)/bin/platform $(DIST_PATH)/bin # from native bin dir, not cross-compiled
-else
- cp $(GOPATH)/bin/darwin_amd64/platform $(DIST_PATH)/bin # from cross-compiled bin dir
-endif
- @# Package
- tar -C dist -czf $(DIST_PATH)-$(BUILD_TYPE_NAME)-osx-amd64.tar.gz mattermost
- @# Cleanup
- rm -f $(DIST_PATH)/bin/platform
-
- @# Make windows package
- @# Copy binary
-ifeq ($(BUILDER_GOOS_GOARCH),"windows_amd64")
- cp $(GOPATH)/bin/platform.exe $(DIST_PATH)/bin # from native bin dir, not cross-compiled
-else
- cp $(GOPATH)/bin/windows_amd64/platform.exe $(DIST_PATH)/bin # from cross-compiled bin dir
-endif
- @# Package
- cd $(DIST_ROOT) && zip -9 -r -q -l mattermost-$(BUILD_TYPE_NAME)-windows-amd64.zip mattermost && cd ..
- @# Cleanup
- rm -f $(DIST_PATH)/bin/platform.exe
-
@# Make linux package
@# Copy binary
-ifeq ($(BUILDER_GOOS_GOARCH),"linux_amd64")
+ifeq ($(BUILDER_GOOS_GOARCH),"linux_arm")
cp $(GOPATH)/bin/platform $(DIST_PATH)/bin # from native bin dir, not cross-compiled
else
- cp $(GOPATH)/bin/linux_amd64/platform $(DIST_PATH)/bin # from cross-compiled bin dir
+ cp $(GOPATH)/bin/linux_arm/platform $(DIST_PATH)/bin # from cross-compiled bin dir
endif
@# Package
- tar -C dist -czf $(DIST_PATH)-$(BUILD_TYPE_NAME)-linux-amd64.tar.gz mattermost
+ tar -C dist -czf $(DIST_PATH)-$(BUILD_TYPE_NAME)-linux-arm.tar.gz mattermost
@# Don't clean up native package so dev machines will have an unzipped package available
@#rm -f $(DIST_PATH)/bin/platform