Merge pull request #8389 from RocketChat/fix-snap-npm-dep

[FIX] Add needed dependency for snaps
RocketChat · Oct 5, 2017 · 3a7ad8b · 3a7ad8b
2 parents 71286e7 + bd42945
commit 3a7ad8b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 215 deletions.
diff --git a/.snapcraft/candidate/snapcraft.yaml b/.snapcraft/candidate/snapcraft.yaml
diff --git a/.snapcraft/edge/snapcraft.yaml b/.snapcraft/edge/snapcraft.yaml
diff --git a/.snapcraft/stable/snapcraft.yaml → .snapcraft/snapcraft.yaml b/.snapcraft/stable/snapcraft.yaml → .snapcraft/snapcraft.yaml
@@ -39,24 +39,17 @@ apps:
 parts:
     node:
         plugin: nodejs
-        node-engine: 4.8.3
-        node-packages:
-            - promise
-            - fibers
-            - underscore
-            - source-map-support
-            - semver
+        node-engine: 4.8.4
         build-packages:
             # For fibers
             - python
             - build-essential
             - nodejs
-        organize:
-            lib/node_modules: node_modules
     rocketchat-server:
         plugin: dump
+        prepare: cd programs/server; npm install
         after: [node]
-        source: https://rocket.chat/releases/latest/download
+        source: https://rocket.chat/releases/#{RC_VERSION}/download
         source-type: tar
         stage-packages:
             - graphicsmagick

diff --git a/.travis/snap.sh b/.travis/snap.sh
@@ -38,7 +38,7 @@ GIT_SSH_COMMAND="ssh -i launchpadkey" git clone -b $CHANNEL git+ssh://rocket.cha
 
 # Rarely will change, but just incase we copy it all
 cp -r resources buildinfo launchpad/
-sed s/#{RC_VERSION}/$RC_VERSION/ $CHANNEL/snapcraft.yaml > launchpad/snapcraft.yaml
+sed s/#{RC_VERSION}/$RC_VERSION/ snapcraft.yaml > launchpad/snapcraft.yaml
 
 cd launchpad
 git add resources snapcraft.yaml buildinfo