Merge pull request #310 from yuya-oc/stop-docker

Stop using Docker and using Ubuntu 14.04 for this in CircleCI
This commit is contained in:
Yuya Ochiai 2016-09-26 21:57:26 +09:00 committed by GitHub
commit aa986afd05
2 changed files with 17 additions and 16 deletions

View file

@ -1,27 +1,34 @@
machine:
pre:
- sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.6 10
- sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.6 10
- sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 20
- sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 20
node:
version: 6.1.0
services:
- docker
dependencies:
cache_directories:
- "~/.electron"
- "src/node_modules"
post:
- mkdir -p ~/.electron
- docker run --rm -it -v `pwd`:/project -v ~/.electron:/root/.electron electronuserland/electron-builder:wine ./docker/package_in_docker.sh
- sudo chown -R ubuntu:ubuntu release
- sudo dpkg --add-architecture i386
- sudo add-apt-repository ppa:ubuntu-wine/ppa -y
- sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
- echo "deb http://download.mono-project.com/repo/debian wheezy main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list
- sudo apt-get update
- sudo apt-get install --no-install-recommends -y icnsutils graphicsmagick xz-utils
- sudo apt-get install --no-install-recommends -y wine1.8 mono-devel ca-certificates-mono
- sudo apt-get install --no-install-recommends -y gcc-multilib g++-multilib
- unset DISPLAY && wineboot --init
- npm run package:all
- npm run package:linux
- npm run installer
- mv release/Mattermost-win32-ia32 release/mattermost-desktop-win32
- mv release/Mattermost-win32-x64 release/mattermost-desktop-win64
- mv release/Mattermost-darwin-x64 release/mattermost-desktop-osx
- mv release/Mattermost-linux-ia32 release/mattermost-desktop-linux-ia32
- mv release/Mattermost-linux-x64 release/mattermost-desktop-linux-x64
- cd release && zip -9 -r $CIRCLE_ARTIFACTS/mattermost-desktop-win32.zip mattermost-desktop-win32
- cd release && zip -9 -r $CIRCLE_ARTIFACTS/mattermost-desktop-win64.zip mattermost-desktop-win64
- tar zcvf $CIRCLE_ARTIFACTS/mattermost-desktop-osx.tar.gz -C release mattermost-desktop-osx

View file

@ -1,6 +0,0 @@
#!/bin/sh
# This script should be executed in docker container.
set -ex
npm run package:all
npm run package:linux
npm run installer