Merge pull request #85 from oSoc18/develop

Merging develop into master
oSoc18 · Jul 12, 2018 · 38277fc · 38277fc
2 parents 02abf52 + 3c5a103
commit 38277fc
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -32,10 +32,8 @@ jobs:
   deploy:
     machine:
       enabled: true
-    steps:
-      - deploy:
-          name: Deploy using SSH keys
-          command: ssh -o "StrictHostKeyChecking no" $SSH_USER@$SSH_HOST "cd ~/build/SmartFlanders; git pull; git checkout master; npm install; forever stopall; forever start index.js"
+    steps: 
+      - run: ssh -o "StrictHostKeyChecking no" $SSH_USER@$SSH_HOST "cd ~/build/SmartFlanders; git reset --hard; rm package-lock.json; git pull; git checkout master; npm install; forever stopall; forever start index.js"
 
 workflows:
   version: 2
@@ -45,6 +43,4 @@ workflows:
       - deploy:
           requires:
             - build
-          filters:
-            branches:
-              only: master
+