diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-12-03 18:26:01 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2018-12-03 18:26:01 +0200 |
commit | af6513ccc7e13f463ec482021286712deddd7ec5 (patch) | |
tree | 80ff4a0ed1859875647a69a2bd97da2f5aa2ca2d | |
parent | 30fe263bfea34431aa2d3bedc904e61f92bdeff5 (diff) | |
parent | 30151de2695c6b0d51816919a4892c66088b6ab7 (diff) | |
download | wekan-af6513ccc7e13f463ec482021286712deddd7ec5.tar.gz wekan-af6513ccc7e13f463ec482021286712deddd7ec5.tar.bz2 wekan-af6513ccc7e13f463ec482021286712deddd7ec5.zip |
Merge branch 'edge' into meteor-1.8
-rw-r--r-- | CHANGELOG.md | 12 | ||||
-rw-r--r-- | Dockerfile | 2 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rwxr-xr-x | rebuild-wekan.sh | 4 | ||||
-rwxr-xr-x | releases/virtualbox/rebuild-wekan.sh | 4 | ||||
-rw-r--r-- | sandstorm-pkgdef.capnp | 4 | ||||
-rw-r--r-- | snapcraft.yaml | 17 |
7 files changed, 22 insertions, 23 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index c808ae70..11cefaa5 100644 --- a/CHANGELOG.md +++ b/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: @@ -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/package.json b/package.json index e2e60637..045dda8a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v1.79.0", + "version": "v1.80.0", "description": "Open-Source kanban", "private": true, "scripts": { 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/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index 567332ac..19b76878 100644 --- a/sandstorm-pkgdef.capnp +++ b/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, 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 |