diff options
| author | Lauri Ojansivu <x@xet7.org> | 2019-02-28 23:32:58 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2019-02-28 23:32:58 +0200 |
| commit | 1ba299585cdf27698894ef6e50ee28a64fb5415d (patch) | |
| tree | 262bfef32e1517aa4e142844bc3e5160f9fa0767 | |
| parent | 174ad1a9877fd0b7523f9a9b074352e5268ffaf7 (diff) | |
| parent | bd2c54398b993b1104ec503efafb0bb24a0ba2a2 (diff) | |
| download | wekan-1ba299585cdf27698894ef6e50ee28a64fb5415d.tar.gz wekan-1ba299585cdf27698894ef6e50ee28a64fb5415d.tar.bz2 wekan-1ba299585cdf27698894ef6e50ee28a64fb5415d.zip | |
Merge branch 'edge' into meteor-1.8
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | Stackerfile.yml | 2 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | sandstorm-pkgdef.capnp | 4 | ||||
| -rw-r--r-- | snapcraft.yaml | 2 | ||||
| -rwxr-xr-x | stacksmith/user-scripts/build.sh | 2 |
7 files changed, 15 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index b23321f2..b455df51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# v2.33 2019-02-28 Wekan release + +This release adds the following upgrades: + +- [Upgrade Node.js to v8.15.1](https://github.com/wekan/wekan/commit/5cafdd9878ab4b6123024ec33279ccdae75f554f). + +Thanks to Node.js developers and GitHub user xet7 for contributions. + # v2.32 2019-02-28 Wekan release This release adds the following [performance improvements](https://github.com/wekan/wekan/pull/2214), thanks to justinr1234: @@ -87,7 +87,7 @@ ARG DEFAULT_AUTHENTICATION_METHOD # ENV BUILD_DEPS="paxctl" ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential python python3 python3-distutils git ca-certificates gcc-7" \ DEBUG=false \ - NODE_VERSION=v8.15.0 \ + NODE_VERSION=v8.15.1 \ METEOR_RELEASE=1.6.0.1 \ USE_EDGE=false \ METEOR_EDGE=1.5-beta.17 \ diff --git a/Stackerfile.yml b/Stackerfile.yml index beb27125..9c011fe3 100644 --- a/Stackerfile.yml +++ b/Stackerfile.yml @@ -1,5 +1,5 @@ appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928 -appVersion: "v2.32.0" +appVersion: "v2.33.0" files: userUploads: - README.md diff --git a/package.json b/package.json index dc0e07df..1f5bbc8e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v2.32.0", + "version": "v2.33.0", "description": "Open-Source kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index 93b08ec8..4fb585cd 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 = 234, + appVersion = 235, # Increment this for every release. - appMarketingVersion = (defaultText = "2.32.0~2019-02-28"), + appMarketingVersion = (defaultText = "2.33.0~2019-02-28"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, diff --git a/snapcraft.yaml b/snapcraft.yaml index b2b3dfd2..afa9eaf4 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -81,7 +81,7 @@ parts: wekan: source: . plugin: nodejs - node-engine: 8.15.0 + node-engine: 8.15.1 node-packages: - node-gyp - node-pre-gyp diff --git a/stacksmith/user-scripts/build.sh b/stacksmith/user-scripts/build.sh index 10823ab1..7e59c531 100755 --- a/stacksmith/user-scripts/build.sh +++ b/stacksmith/user-scripts/build.sh @@ -2,7 +2,7 @@ set -euxo pipefail BUILD_DEPS="bsdtar gnupg wget curl bzip2 python git ca-certificates perl-Digest-SHA" -NODE_VERSION=v8.15.0 +NODE_VERSION=v8.15.1 #METEOR_RELEASE=1.6.0.1 - for Stacksmith, meteor-1.8 branch that could have METEOR@1.8.1-beta.8 or newer USE_EDGE=false METEOR_EDGE=1.5-beta.17 |