summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2018-02-08 13:43:01 +0200
committerLauri Ojansivu <x@xet7.org>2018-02-08 13:43:01 +0200
commit36a2aa355e41a8887a66c94695a4e078b026f9aa (patch)
tree144177816ff1f996e5147164d261ed93719a6ee9
parentb3d31588634b3ff01b113579a7a715f1f9f2f234 (diff)
parentcea810157447355754329f8cd8793f0e80e0fe18 (diff)
downloadwekan-36a2aa355e41a8887a66c94695a4e078b026f9aa.tar.gz
wekan-36a2aa355e41a8887a66c94695a4e078b026f9aa.tar.bz2
wekan-36a2aa355e41a8887a66c94695a4e078b026f9aa.zip
Merge branch 'kubiko-devel-fix' into devel
Fix snap store rejection. Thanks to kubiko ! Closes wekan/wekan-snap#20, closes wekan/wekan-snap#28, closes wekan/wekan-snap#27, closes wekan/wekan-snap#24
-rw-r--r--CHANGELOG.md8
-rw-r--r--snapcraft.yaml4
2 files changed, 10 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35d7675a..ab40cad7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# Upcoming Wekan release
+
+This release fixes the following bugs:
+
+- [Fix Ubuntu snap build](https://github.com/wekan/wekan/pull/1469).
+
+Thanks to GitHub user kubiko for contributions.
+
# v0.72 2018-02-07 Wekan release
This release fixes the following bugs:
diff --git a/snapcraft.yaml b/snapcraft.yaml
index ece489de..1a85f682 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -76,9 +76,8 @@ parts:
- node-gyp
- node-pre-gyp
- fibers@2.0.0
- stage-packages:
- - ca-certificates
build-packages:
+ - ca-certificates
- apt-utils
- python
- g++
@@ -118,6 +117,7 @@ parts:
install: |
cp -r .build/bundle/* $SNAPCRAFT_PART_INSTALL/
cp .build/bundle/.node_version.txt $SNAPCRAFT_PART_INSTALL/
+ rm $SNAPCRAFT_PART_INSTALL/lib/node_modules/wekan
organize:
README: README.wekan