aaron/mattermost-desktop
1
0
Fork 0
Code Issues Pull requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'update-electron' into dev

Browse source 
Close #116
This commit is contained in:
Yuya Ochiai 2016-05-02 19:45:30 +09:00
parent 28dc6ac0d9 84440d7ecc
commit 2468d2a6b2
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
circle.yml
View file

@ -5,7 +5,7 @@ machine:
- sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 20 - 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 - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 20
node: node:
version: 5.1.0 version: 5.10.0
services: services:
- docker - docker
@ -14,8 +14,6 @@ dependencies:
- "~/.electron" - "~/.electron"
- "src/node_modules" - "src/node_modules"
- "~/docker_cache" - "~/docker_cache"
pre:
- npm install -g npm@3.3.12
post: post:
- ./docker/circle_docker_build.sh - ./docker/circle_docker_build.sh
- mkdir -p ~/.electron - mkdir -p ~/.electron

2
docker/Dockerfile
View file

@ -1,7 +1,7 @@
FROM suchja/wine:latest FROM suchja/wine:latest
MAINTAINER Yuya Ochiai <yuya0321@gmail.com> MAINTAINER Yuya Ochiai <yuya0321@gmail.com>
ENV NODE_VERSION=v5.1.0 ENV NODE_VERSION=v5.10.0
ENV PATH=$HOME/.nodebrew/current/bin:$PATH ENV PATH=$HOME/.nodebrew/current/bin:$PATH
USER root USER root

2
package.json
View file

@ -33,7 +33,7 @@
"electron-builder": "^3.11.0", "electron-builder": "^3.11.0",
"electron-connect": "^0.3.7", "electron-connect": "^0.3.7",
"electron-packager": "^5.1.0", "electron-packager": "^5.1.0",
"electron-prebuilt": "0.37.3", "electron-prebuilt": "0.37.7",
"esformatter": "^0.9.3", "esformatter": "^0.9.3",
"esformatter-jsx": "^5.0.0", "esformatter-jsx": "^5.0.0",
"gulp": "^3.9.0", "gulp": "^3.9.0",