fix deploy scripts

circle.yml

@@ -1,8 +1,6 @@
 machine:
   timezone:
     Europe/Copenhagen
-  node:
-    version: 7.3.0
   php:
     version: 5.6.22
 
@@ -24,8 +22,6 @@ dependencies:
     - "~/patch/wordpress/wp-content/themes/patch/node_modules" # relative to the user's home directory
 
   pre:
-    - npm install gulp -g
-
     # No password is required for the MySQL user `ubuntu`
     - mysql -u ubuntu -e "create database wordpress"
 
@@ -65,6 +61,11 @@ dependencies:
     - sudo apt-get purge libapache2-mod-php5
     - sudo apt-get update && sudo apt-get install libapache2-mod-php5
 
+    # Remove phpunit 6 and install the 5.7 version since we are not ready to go for php 7
+    - wget https://phar.phpunit.de/phpunit-5.7.phar
+    - chmod +x phpunit-5.7.phar
+    - sudo mv phpunit-5.7.phar /usr/local/bin/phpunit
+
   post:
     # Copy Apache conf into `site-available`
     - sudo cp ~/patch/tests/apache-ci.conf /etc/apache2/sites-available
@@ -79,21 +80,15 @@ test:
   override:
     - sudo mkdir -p $CIRCLE_TEST_REPORTS/phpunit
 
-    # This is just for us to see that the WP Pusher plugin was actually installed and is active
-    # - ./wp-cli.phar plugin list --path=wordpress
     # Finally, run our Behat features
     - cd wordpress/wp-content/themes/patch/tests; phpunit --log-junit $CIRCLE_TEST_REPORTS/phpunit/junit.xml
 
 deployment:
   test:
     branch: test
     commands:
-     - sh ./circle_scripts/deploy_test.sh
-     - sleep 15 # need to wait a few secs, because the commit won't have effects instantly on server
-     - curl https://test.demos.pixelgrade.com/git-webhook.php
+     - sh ./circle_scripts/deploy_test.sh && sleep 10 && curl https://test.demos.pixelgrade.com/git-webhook.php # need to wait a few secs, because the commit won't have effects instantly on server
   production:
     branch: master
     commands:
-     - sh ./circle_scripts/deploy_production.sh
-     - sleep 15 # need to wait a few secs, because the commit won't have effects instantly on server
-     - curl https://demos.pixelgrade.com/git-webhook.php
+     - sh ./circle_scripts/deploy_production.sh && sleep 10 && curl https://demos.pixelgrade.com/git-webhook.php # need to wait a few secs, because the commit won't have effects instantly on server