From fe7c4528d7c19ab77f2d2ea098e83f6a4c6650f4 Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Mon, 3 Dec 2018 18:19:25 +0200
Subject: - Upgrade Node from v8.12 to v8.14 - Revert non-working architectures
 that were added at v1.79, so now Wekan is just amd64 as before.

Thanks to xet7 !
---
 CHANGELOG.md                         | 12 ++++++++++++
 Dockerfile                           |  2 +-
 rebuild-wekan.sh                     |  4 ++--
 releases/virtualbox/rebuild-wekan.sh |  4 ++--
 snapcraft.yaml                       | 17 ++---------------
 5 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c808ae70..02a09293 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# Upcoming Wekan release
+
+This release adds the following new features:
+
+- Upgrade Node from v8.12 to v8.14
+
+and fixes the following bugs:
+
+- Revert non-working architectures that were added at v1.79, so now Wekan is just amd64 as before.
+
+Thanks to GitHub user xet7 for contributions.
+
 # v1.79 2018-12-03 Wekan release
 
 This release adds the following new features:
diff --git a/Dockerfile b/Dockerfile
index 966e0e1d..641d3d38 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -75,7 +75,7 @@ ARG CORS
 # DOES NOT WORK: paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303
 # ENV BUILD_DEPS="paxctl"
 ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential python git ca-certificates gcc-7" \
-    NODE_VERSION=v8.12.0 \
+    NODE_VERSION=v8.14.0 \
     METEOR_RELEASE=1.6.0.1 \
     USE_EDGE=false \
     METEOR_EDGE=1.5-beta.17 \
diff --git a/rebuild-wekan.sh b/rebuild-wekan.sh
index 42364515..d50e2aff 100755
--- a/rebuild-wekan.sh
+++ b/rebuild-wekan.sh
@@ -4,7 +4,7 @@ echo "Note: If you use other locale than en_US.UTF-8 , you need to additionally
 echo "      with 'sudo dpkg-reconfigure locales' , so that MongoDB works correctly."
 echo "      You can still use any other locale as your main locale."
 
-X64NODE="https://nodejs.org/dist/v8.12.0/node-v8.12.0-linux-x64.tar.gz"
+X64NODE="https://nodejs.org/dist/v8.14.0/node-v8.14.0-linux-x64.tar.gz"
 
 function pause(){
 	read -p "$*"
@@ -74,7 +74,7 @@ do
 				sudo apt install -y build-essential git curl wget
 #				sudo apt -y install nodejs npm
 #				npm_call -g install n
-#				sudo n 8.12.0
+#				sudo n 8.14.0
 			fi
 
 #			if [ "$(grep -Ei 'debian' /etc/*release)" ]; then
diff --git a/releases/virtualbox/rebuild-wekan.sh b/releases/virtualbox/rebuild-wekan.sh
index e7d55107..ca00f0e2 100755
--- a/releases/virtualbox/rebuild-wekan.sh
+++ b/releases/virtualbox/rebuild-wekan.sh
@@ -4,7 +4,7 @@ echo "Note: If you use other locale than en_US.UTF-8 , you need to additionally
 echo "      with 'sudo dpkg-reconfigure locales' , so that MongoDB works correctly."
 echo "      You can still use any other locale as your main locale."
 
-X64NODE="https://releases.wekan.team/node-v8.11.3-linux-x64.tar.gz"
+X64NODE="https://releases.wekan.team/node-v8.14.0-linux-x64.tar.gz"
 
 function pause(){
 	read -p "$*"
@@ -25,7 +25,7 @@ do
 				sudo apt install -y build-essential git curl wget
 				sudo apt -y install nodejs npm
 				sudo npm -g install n
-				sudo n 8.11.3
+				sudo n 8.14.0
 			fi
 
 			if [ "$(grep -Ei 'debian' /etc/*release)" ]; then
diff --git a/snapcraft.yaml b/snapcraft.yaml
index b876bfbf..c69b1dcc 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -14,20 +14,7 @@ confinement: strict
 grade: stable
 
 architectures:
-  - build-on: amd64
-    run-on: amd64
-
-  - build-on: i386
-    run-on: i386
-    build-error: ignore
-
-  - build-on: armhf
-    run-on: armhf
-    build-error: ignore
-
-  - build-on: arm64
-    run-on: arm64
-    build-error: ignore
+  - amd64
 
 plugs:
   mongodb-plug:
@@ -94,7 +81,7 @@ parts:
     wekan:
         source: .
         plugin: nodejs
-        node-engine: 8.12.0
+        node-engine: 8.14.0
         node-packages:
             - node-gyp
             - node-pre-gyp
-- 
cgit v1.2.3-1-g7c22