From 9fe9e527092bb3b2ccb073c03e2a0bb93afcfdf3 Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Wed, 27 Apr 2016 22:16:12 +0900 Subject: [PATCH 1/2] Update Electron to 0.37.7 --- circle.yml | 5 +++-- docker/Dockerfile | 2 +- package.json | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/circle.yml b/circle.yml index d192fb0d..c5c6e43e 100644 --- a/circle.yml +++ b/circle.yml @@ -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/g++ g++ /usr/bin/g++-4.8 20 node: - version: 5.1.0 + version: 5.10.0 services: - docker @@ -15,7 +15,8 @@ dependencies: - "src/node_modules" - "~/docker_cache" pre: - - npm install -g npm@3.3.12 + - npm -v + - npm install -g npm@3.8.3 post: - ./docker/circle_docker_build.sh - mkdir -p ~/.electron diff --git a/docker/Dockerfile b/docker/Dockerfile index 18b06cf4..476ef4ea 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,7 +1,7 @@ FROM suchja/wine:latest MAINTAINER Yuya Ochiai -ENV NODE_VERSION=v5.1.0 +ENV NODE_VERSION=v5.10.0 ENV PATH=$HOME/.nodebrew/current/bin:$PATH USER root diff --git a/package.json b/package.json index 751dc1d5..417147bc 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "electron-builder": "^3.11.0", "electron-connect": "^0.3.7", "electron-packager": "^5.1.0", - "electron-prebuilt": "0.37.3", + "electron-prebuilt": "0.37.7", "esformatter": "^0.9.3", "esformatter-jsx": "^5.0.0", "gulp": "^3.9.0", From 84440d7ecc9a63d8816fa2ee000281da3839cc9a Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Mon, 2 May 2016 19:38:11 +0900 Subject: [PATCH 2/2] Remove unnecessary commands from circle.yml --- circle.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/circle.yml b/circle.yml index c5c6e43e..04e77398 100644 --- a/circle.yml +++ b/circle.yml @@ -14,9 +14,6 @@ dependencies: - "~/.electron" - "src/node_modules" - "~/docker_cache" - pre: - - npm -v - - npm install -g npm@3.8.3 post: - ./docker/circle_docker_build.sh - mkdir -p ~/.electron