From e21c47d3cfe0f228ce5ab394142c6ec6ee090d65 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 29 Aug 2019 00:18:15 +0300 Subject: Upgrade node, mongo and fibers. Thanks to xet7 ! --- snapcraft.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index 2dfb3bbb..9419e932 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -81,11 +81,11 @@ parts: wekan: source: . plugin: nodejs - node-engine: 8.16.0 + node-engine: 8.16.1 node-packages: - node-gyp - node-pre-gyp - - fibers@2.0.0 + - fibers build-packages: - ca-certificates - apt-utils -- cgit v1.2.3-1-g7c22 From 7761a22bb4e88ad9a5a39ed84e1ff244015c3a58 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 29 Aug 2019 00:45:37 +0300 Subject: Fix Snap. Thanks to xet7 ! --- snapcraft.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index 9419e932..15fd9fc3 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -85,7 +85,7 @@ parts: node-packages: - node-gyp - node-pre-gyp - - fibers + - fibers@2.0.0 build-packages: - ca-certificates - apt-utils @@ -190,7 +190,7 @@ parts: # git clone --depth 1 -b master --recurse-submodules https://github.com/wekan/markdown.git # cd .. #fi - rm -rf package-lock.json .build + rm -rf .build meteor add standard-minifier-js --allow-superuser meteor npm install --allow-superuser meteor npm install --allow-superuser --save babel-runtime -- cgit v1.2.3-1-g7c22 From 007c0646721f7e701e135ceb0a89e478c3400e88 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 29 Aug 2019 02:09:01 +0300 Subject: Fix dirty snap release. https://stackoverflow.com/questions/16035240/why-is-git-describe-dirty-adding-a-dirty-suffix-when-describing-a-clean-ch https://forum.snapcraft.io/t/dirty-snap-release/12975 Thanks to xet7. --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index 15fd9fc3..4b94a8ca 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,6 +1,6 @@ name: wekan version: 0 -version-script: git describe --dirty --tags | cut -c 2- +version-script: git update-index --refresh && git describe --dirty --tags | cut -c 2- summary: The open-source kanban description: | Wekan is an open-source and collaborative kanban board application. -- cgit v1.2.3-1-g7c22 From e5b9d41e677e13caf3875c30ee4406778a931724 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 29 Aug 2019 15:12:00 +0300 Subject: Revert fix dirty, because it caused Snap build to fail. Thanks to xet7 ! --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index 4b94a8ca..15fd9fc3 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,6 +1,6 @@ name: wekan version: 0 -version-script: git update-index --refresh && git describe --dirty --tags | cut -c 2- +version-script: git describe --dirty --tags | cut -c 2- summary: The open-source kanban description: | Wekan is an open-source and collaborative kanban board application. -- cgit v1.2.3-1-g7c22 From 5084102e6e17fa2cb3bc8c1180745e15379fab5f Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 29 Aug 2019 15:14:35 +0300 Subject: Delete another phantomjs binary from Snap. Thanks to xet7 ! --- snapcraft.yaml | 1 + 1 file changed, 1 insertion(+) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index 15fd9fc3..000039cc 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -215,6 +215,7 @@ parts: cp .build/bundle/.node_version.txt $SNAPCRAFT_PART_INSTALL/ rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/wekan rm -f $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/meteor/rajit_bootstrap3-datepicker/lib/bootstrap-datepicker/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs + rm -f $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/meteor/lucasantoniassi_accounts-lockout/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs rm -f $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/tar/lib/.mkdir.js.swp rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/node-pre-gyp/node_modules/tar/lib/.mkdir.js.swp rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/node-gyp/node_modules/tar/lib/.mkdir.js.swp -- cgit v1.2.3-1-g7c22 From 0ff5ce8fde6cc9a05a3c8b93e18ebce7282d3a67 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 29 Aug 2019 15:30:14 +0300 Subject: Snap: Change version-script to adopt-info to fix dirty. https://forum.snapcraft.io/t/dirty-snap-release/12975/4 Thanks to popey and daniel at Snapcraft forum. --- snapcraft.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index 000039cc..e4e868f5 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,6 +1,5 @@ name: wekan version: 0 -version-script: git describe --dirty --tags | cut -c 2- summary: The open-source kanban description: | Wekan is an open-source and collaborative kanban board application. @@ -221,7 +220,7 @@ parts: rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/node-gyp/node_modules/tar/lib/.mkdir.js.swp # Meteor 1.8.x additional .swp remove rm -f $SNAPCRAFT_PART_INSTALL/programs/server/node_modules/node-pre-gyp/node_modules/tar/lib/.mkdir.js.swp - + adopt-info: snapcraftctl set-version $(git describe --dirty --tags | cut -c 2-) organize: README: README.wekan prime: -- cgit v1.2.3-1-g7c22 From 8a74210c609dc6c0def65c9e8b92e85fcb4b2f0a Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 29 Aug 2019 16:02:21 +0300 Subject: Try to fix adopt-info. --- snapcraft.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index e4e868f5..beef4a85 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,6 +1,7 @@ name: wekan version: 0 -summary: The open-source kanban +adopt-info: snapcraftctl set-version $(git describe --dirty --tags | cut -c 2-) +summary: The Open-Source kanban description: | Wekan is an open-source and collaborative kanban board application. @@ -220,7 +221,6 @@ parts: rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/node-gyp/node_modules/tar/lib/.mkdir.js.swp # Meteor 1.8.x additional .swp remove rm -f $SNAPCRAFT_PART_INSTALL/programs/server/node_modules/node-pre-gyp/node_modules/tar/lib/.mkdir.js.swp - adopt-info: snapcraftctl set-version $(git describe --dirty --tags | cut -c 2-) organize: README: README.wekan prime: -- cgit v1.2.3-1-g7c22 From be5f435bc5f500b24bc838ac1dc8bf3bb9a33a22 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 29 Aug 2019 16:15:57 +0300 Subject: Try to fix adopt-info. https://forum.snapcraft.io/t/dirty-snap-release/12975/8 Thanks to ogra at Snapcraft forum. --- snapcraft.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index beef4a85..be35b3fc 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,6 +1,6 @@ name: wekan version: 0 -adopt-info: snapcraftctl set-version $(git describe --dirty --tags | cut -c 2-) +adopt-info: mypart summary: The Open-Source kanban description: | Wekan is an open-source and collaborative kanban board application. @@ -226,6 +226,11 @@ parts: prime: - -lib/node_modules/node-pre-gyp/node_modules/tar/lib/.unpack.js.swp + mypart: + override-build: | + snapcraftctl set-version "$(git describe --dirty --tags | cut -c 2-)" + snapcraftctl build + helpers: source: snap-src plugin: dump -- cgit v1.2.3-1-g7c22 From 9bc80406347728a3aa19c1bc7df2566aca84abe6 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 29 Aug 2019 16:31:45 +0300 Subject: Try to fix adopt-info. Thanks to xet7. --- snapcraft.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index be35b3fc..0f318992 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -63,6 +63,12 @@ apps: command: mongodb-restore plugs: [network, network-bind] +part: + mypart: + override-build: | + snapcraftctl set-version "$(git describe --dirty --tags | cut -c 2-)" + snapcraftctl build + parts: mongodb: source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-3.2.22.tgz @@ -226,11 +232,6 @@ parts: prime: - -lib/node_modules/node-pre-gyp/node_modules/tar/lib/.unpack.js.swp - mypart: - override-build: | - snapcraftctl set-version "$(git describe --dirty --tags | cut -c 2-)" - snapcraftctl build - helpers: source: snap-src plugin: dump -- cgit v1.2.3-1-g7c22 From 79d4cd83b1fa83bb814230683b7449ed7f3e1ede Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 29 Aug 2019 16:37:03 +0300 Subject: Fix Snap adopt-info. https://forum.snapcraft.io/t/dirty-snap-release/12975/12?u=xet7 Thanks to popey at Snapcraft forum. --- snapcraft.yaml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index 0f318992..411717a1 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,6 +1,6 @@ name: wekan version: 0 -adopt-info: mypart +adopt-info: wekan summary: The Open-Source kanban description: | Wekan is an open-source and collaborative kanban board application. @@ -63,12 +63,6 @@ apps: command: mongodb-restore plugs: [network, network-bind] -part: - mypart: - override-build: | - snapcraftctl set-version "$(git describe --dirty --tags | cut -c 2-)" - snapcraftctl build - parts: mongodb: source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-3.2.22.tgz @@ -227,6 +221,9 @@ parts: rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/node-gyp/node_modules/tar/lib/.mkdir.js.swp # Meteor 1.8.x additional .swp remove rm -f $SNAPCRAFT_PART_INSTALL/programs/server/node_modules/node-pre-gyp/node_modules/tar/lib/.mkdir.js.swp + # Wekan version + snapcraftctl set-version "$(git describe --dirty --tags | cut -c 2-)" + snapcraftctl build organize: README: README.wekan prime: -- cgit v1.2.3-1-g7c22 From d5403bbfc53390aeaaf68eb452bc24d88f1e0942 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 29 Aug 2019 19:38:25 +0300 Subject: Snap: Delete all .swp files. Thanks to xet7 ! --- snapcraft.yaml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index 411717a1..12c7ac66 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -213,14 +213,21 @@ parts: cd ../../../.. cp -r .build/bundle/* $SNAPCRAFT_PART_INSTALL/ cp .build/bundle/.node_version.txt $SNAPCRAFT_PART_INSTALL/ - rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/wekan + # Delete phantomjs rm -f $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/meteor/rajit_bootstrap3-datepicker/lib/bootstrap-datepicker/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs rm -f $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/meteor/lucasantoniassi_accounts-lockout/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs - rm -f $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/tar/lib/.mkdir.js.swp - rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/node-pre-gyp/node_modules/tar/lib/.mkdir.js.swp - rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/node-gyp/node_modules/tar/lib/.mkdir.js.swp + # Delete all .swp files at subdirectories + find $SNAPCRAFT_PART_INSTALL -name \*.swp -type f -delete + # OLD: Delete each .swp file separately + #rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/wekan + #rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/wekan/.build/bundle/programs/server/npm/node_modules/tar/lib/.mkdir.js.swp + #rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/wekan/.build/bundle/programs/server/node_modules/node-pre-gyp/node_modules/tar/lib/.mkdir.js.swp + #rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/wekan/node_modules/tar/lib/.mkdir.js.swp + #rm -f $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/tar/lib/.mkdir.js.swp + #rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/node-pre-gyp/node_modules/tar/lib/.mkdir.js.swp + #rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/node-gyp/node_modules/tar/lib/.mkdir.js.swp # Meteor 1.8.x additional .swp remove - rm -f $SNAPCRAFT_PART_INSTALL/programs/server/node_modules/node-pre-gyp/node_modules/tar/lib/.mkdir.js.swp + #rm -f $SNAPCRAFT_PART_INSTALL/programs/server/node_modules/node-pre-gyp/node_modules/tar/lib/.mkdir.js.swp # Wekan version snapcraftctl set-version "$(git describe --dirty --tags | cut -c 2-)" snapcraftctl build -- cgit v1.2.3-1-g7c22 From 71d32c6bc8e6affd345026797ff31e94a0a10d77 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 29 Aug 2019 21:08:14 +0300 Subject: Try to fix snap. --- snapcraft.yaml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index 12c7ac66..9c82c6d0 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,5 +1,4 @@ name: wekan -version: 0 adopt-info: wekan summary: The Open-Source kanban description: | @@ -217,17 +216,17 @@ parts: rm -f $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/meteor/rajit_bootstrap3-datepicker/lib/bootstrap-datepicker/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs rm -f $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/meteor/lucasantoniassi_accounts-lockout/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs # Delete all .swp files at subdirectories - find $SNAPCRAFT_PART_INSTALL -name \*.swp -type f -delete - # OLD: Delete each .swp file separately + #find $SNAPCRAFT_PART_INSTALL -name \*.swp -type f -delete + # Delete each .swp file separately #rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/wekan - #rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/wekan/.build/bundle/programs/server/npm/node_modules/tar/lib/.mkdir.js.swp - #rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/wekan/.build/bundle/programs/server/node_modules/node-pre-gyp/node_modules/tar/lib/.mkdir.js.swp - #rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/wekan/node_modules/tar/lib/.mkdir.js.swp - #rm -f $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/tar/lib/.mkdir.js.swp - #rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/node-pre-gyp/node_modules/tar/lib/.mkdir.js.swp - #rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/node-gyp/node_modules/tar/lib/.mkdir.js.swp + rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/wekan/.build/bundle/programs/server/npm/node_modules/tar/lib/.mkdir.js.swp + rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/wekan/.build/bundle/programs/server/node_modules/node-pre-gyp/node_modules/tar/lib/.mkdir.js.swp + rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/wekan/node_modules/tar/lib/.mkdir.js.swp + rm -f $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/tar/lib/.mkdir.js.swp + rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/node-pre-gyp/node_modules/tar/lib/.mkdir.js.swp + rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/node-gyp/node_modules/tar/lib/.mkdir.js.swp # Meteor 1.8.x additional .swp remove - #rm -f $SNAPCRAFT_PART_INSTALL/programs/server/node_modules/node-pre-gyp/node_modules/tar/lib/.mkdir.js.swp + rm -f $SNAPCRAFT_PART_INSTALL/programs/server/node_modules/node-pre-gyp/node_modules/tar/lib/.mkdir.js.swp # Wekan version snapcraftctl set-version "$(git describe --dirty --tags | cut -c 2-)" snapcraftctl build -- cgit v1.2.3-1-g7c22