Browse Source

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

Benjamin Gaudé 2 years ago
parent
commit
9bf744d46f
4 changed files with 7 additions and 6 deletions
  1. 3
    0
      .dockerignore
  2. 3
    0
      .tamarinrc
  3. 1
    1
      Makefile
  4. 0
    5
      debian/changelog

+ 3
- 0
.dockerignore View File

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

+ 3
- 0
.tamarinrc View File

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

+ 1
- 1
Makefile View File

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

+ 0
- 5
debian/changelog View File

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