Merge branch 'edge' into meteor-1.8

CHANGELOG.md

@@ -1,3 +1,15 @@
+# v1.80 2018-12-03 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:

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 \

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v1.79.0",
+  "version": "v1.80.0",
   "description": "Open-Source kanban",
   "private": true,
   "scripts": {

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

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

sandstorm-pkgdef.capnp

@@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = (
     appTitle = (defaultText = "Wekan"),
     # The name of the app as it is displayed to the user.
 
-    appVersion = 181,
+    appVersion = 182,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "1.79.0~2018-12-03"),
+    appMarketingVersion = (defaultText = "1.80.0~2018-12-03"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,

snapcraft.yaml

@@ -14,20 +14,7 @@ confinement: strict
 grade: stable
 
 architectures:
-  - build-on: amd64
+  - 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
 
 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