Merge branch 'upgrade-electron' of https://forge.cadoles.com/Cadoles/pitaya-launcher into upgrade-electron

This commit is contained in:
Benjamin Gaudé 2017-04-21 14:46:45 +02:00
commit 9bf744d46f
4 changed files with 7 additions and 6 deletions

3
.dockerignore Normal file
View File

@ -0,0 +1,3 @@
/dist
/node_modules
/build

3
.tamarinrc Normal file
View File

@ -0,0 +1,3 @@
project_version=0.0.2
project_name=pitaya
no_version_suffix=no

View File

@ -11,7 +11,7 @@ all: build
build: build:
apt-get update apt-get update
apt-get install --yes --no-install-recommends curl ca-certificates apt-get install --yes --no-install-recommends curl ca-certificates
curl --silent --location https://deb.nodesource.com/setup_0.12 | bash - curl --silent --location https://deb.nodesource.com/setup_6.x | bash -
apt-get install --yes nodejs apt-get install --yes nodejs
npm install --ignore-scripts npm install --ignore-scripts
ARCH=$(ELECTRON_ARCH) npm run build ARCH=$(ELECTRON_ARCH) npm run build

5
debian/changelog vendored
View File

@ -1,5 +0,0 @@
pitaya (0.0.1) unstable; urgency=low
* Dev release
-- William Petit <wpetit@cadoles.com> Fri, 16 Oct 2015 15:57:03 +0200