update snap

wanglian · Apr 18, 2020 · 28d7e8b · 28d7e8b
1 parent 3ca4180
commit 28d7e8b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/.snapcraft/resources/prepareWorkBase b/.snapcraft/resources/prepareWorkBase
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-curl -SLf "https://github.com/wanglian/workbase-server/releases/download/#{WB_VERSION}/workbase.tar.gz" -o workbase.tar.gz
+curl -SLf "https://github.com/wanglian/workbase-server/releases/download/v0.0.18/workbase.tar.gz" -o workbase.tar.gz
 
 tar xf workbase.tar.gz --strip 1
 
@@ -27,4 +27,8 @@ npm i
 # execstack --clear-execstack npm/node_modules/sharp/vendor/lib/librsvg-2.so*
 
 # Having to manually remove because of latest warning
-# rm -rf npm/node_modules/meteor/konecty_user-presence/node_modules/colors/lib/.colors.js.swp
+# rm -rf npm/node_modules/meteor/konecty_user-presence/node_modules/colors/lib/.colors.js.swp
+
+# not know why, sometimes change
+# rm npm/node_modules/meteor/raix_push/node_modules/husky/.node_modules-garbage-110lol.3kudxo/strip-indent
+rm npm/node_modules/meteor/raix_push/node_modules/husky/.node_modules-garbage-1448af4.zfbyl/strip-indent
diff --git a/.snapcraft/resources/preparenode b/.snapcraft/resources/preparenode
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-node_version="v8.11.3"
+node_version="v12.16.1"
 
 unamem="$(uname -m)"
 if [[ $unamem == *aarch64* ]]; then

diff --git a/.snapcraft/snap/snapcraft.yaml → snapcraft.yaml b/.snapcraft/snap/snapcraft.yaml → snapcraft.yaml
@@ -7,15 +7,14 @@
 # 5.  `snapcraft snap`
 
 name: workbase-server
-version: #{WB_VERSION}
+version: v0.0.18
 summary: WorkBase server
 description: Have your own network, built with Meteor.
 grade: stable
 confinement: strict
 assumes: [snapd2.21]
 architectures:
-  - build-on: amd64
-    run-on: amd64
+  - build-on: [armhf]
 apps:
     workbase-server:
         command: startWorkBase
@@ -46,6 +45,7 @@ hooks:
 parts:
     node:
         plugin: dump 
+        source: ./.snapcraft/
         override-build: |
             ./resources/preparenode
             snapcraftctl build
@@ -62,7 +62,7 @@ parts:
             ./resources/prepareWorkBase
             snapcraftctl build
         after: [node]
-        source: .
+        source: ./.snapcraft/
         stage-packages:
             - graphicsmagick
             - execstack
@@ -73,10 +73,11 @@ parts:
             - .node_version.txt
             - etc
             - usr
+            - star.json
     mongodb:
         build-packages:
             - wget
-        source: ./
+        source: ./.snapcraft/
         override-build: |
             ./resources/preparemongo
             snapcraftctl build
@@ -89,7 +90,7 @@ parts:
             - lib
     scripts:
         plugin: dump
-        source: resources/
+        source: .snapcraft/resources/
         organize:
             backupdb: bin/backupdb
             restoredb: bin/restoredb
@@ -105,7 +106,7 @@ parts:
             ./resources/preparecaddy
             snapcraftctl build
         plugin: dump
-        source: ./
+        source: ./.snapcraft/
         prime:
             - bin
         organize: