Fix drone build

scrapinghub · Mar 6, 2017 · 8cf4f3d · 8cf4f3d
1 parent 95b7378
commit 8cf4f3d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -4,9 +4,12 @@ script:
   - echo "Portia is at:"`git show -s --pretty=%d HEAD`
   - git restore-mtime
   - shopt -s extglob
+  - nvm install 6.10.0
+  - nvm use 6.10.0
   - sudo mkdir -p ~/.npm ~/.node-gyp ~/.cache
   - sudo chown -R ubuntu ~/.npm ~/.node-gyp ~/.cache
   - npm install -g bower ember-cli --cache-min 999999
+  - ember version
   - docker/compile-assets.sh
   - build_docker_image
   - publish_to_dockerhub

diff --git a/portiaui/ember-cli-build.js b/portiaui/ember-cli-build.js
@@ -1,8 +1,8 @@
 /* global require, module */
 var EmberApp = require('ember-cli/lib/broccoli/ember-app');
-var UnwatchedDir = require('ember-cli/node_modules/broccoli-source').UnwatchedDir;
-var WatchedDir = require('ember-cli/node_modules/broccoli-source').WatchedDir;
-var concat = require('ember-cli/node_modules/broccoli-concat');
+var UnwatchedDir = require('broccoli-source').UnwatchedDir;
+var WatchedDir = require('broccoli-source').WatchedDir;
+var concat = require('broccoli-concat');
 var mergeTrees = require('ember-cli/lib/broccoli/merge-trees');
 
 module.exports = function(defaults) {