Merge pull request #38 from ibuildingsnl/improvement/travis-tweaks-two

Further caching and composer tweaks
ibuildingsnl · Apr 25, 2014 · ed9a2cb · ed9a2cb
2 parents 8e1ccfb + 28cfd44
commit ed9a2cb
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/bin/qa-tools b/bin/qa-tools
@@ -22,7 +22,7 @@ use \Ibuildings\QA\Tools\Common\Settings;
 
 $appConfig = new Settings($baseDir, $packageBaseDir);
 
-$application = new Application('Ibuildings QA Tools Setup', '1.1.16', $appConfig);
+$application = new Application('Ibuildings QA Tools Setup', '1.1.17', $appConfig);
 
 $application->add(new \Ibuildings\QA\Tools\Common\Console\InstallCommand());
 $application->add(new \Ibuildings\QA\Tools\Javascript\Console\InstallJsHintCommand());

diff --git a/config-dist/.travis.yml.dist b/config-dist/.travis.yml.dist
@@ -22,12 +22,12 @@ env:
 {% endif %}
 cache:
   directories:
-    - ./vendor
+    - ~/.composer
 
 before_script:
+  - phpenv config-add .travis.php.ini
   - composer self-update
   - composer install --prefer-dist
-  - phpenv config-add .travis.php.ini
 
 script:
   - ant

diff --git a/src/Ibuildings/QA/tests/Common/Console/ChangeSetPreCommitCommandTest.php b/src/Ibuildings/QA/tests/Common/Console/ChangeSetPreCommitCommandTest.php
@@ -33,7 +33,7 @@ public function setup()
 
         $changesetCommand = $this->getMock('Ibuildings\QA\Tools\Common\Console\ChangeSetPreCommitCommand', array('getChangeSet'));
 
-        $this->application = new Application('ibuildings qa tools', '1.1.16', $settings);
+        $this->application = new Application('ibuildings qa tools', '1.1.17', $settings);
 
         $changesetCommand->expects($this->any())
             ->method('getChangeSet')

diff --git a/src/Ibuildings/QA/tests/Common/Console/InstallCommandTest.php b/src/Ibuildings/QA/tests/Common/Console/InstallCommandTest.php
@@ -37,7 +37,7 @@ public function setup()
         $packageBaseDir = realpath(__DIR__ . '/../../../../../../');
         $settings = new SettingsMock($baseDir, $packageBaseDir);
 
-        $this->application = $this->getMock('Ibuildings\QA\Tools\Common\Application', array('getDialogHelper'), array('ibuildings qa tools', '1.1.16', $settings));
+        $this->application = $this->getMock('Ibuildings\QA\Tools\Common\Application', array('getDialogHelper'), array('ibuildings qa tools', '1.1.17', $settings));
 
         $dialog = $this->getMock('Ibuildings\QA\Tools\Common\Console\Helper\DialogHelper', array('askConfirmation', 'askAndValidate', 'select'));
 

diff --git a/src/Ibuildings/QA/tests/Common/Console/InstallPreCommitHookCommandTest.php b/src/Ibuildings/QA/tests/Common/Console/InstallPreCommitHookCommandTest.php
@@ -41,7 +41,7 @@ public function setup()
         $preCommitHookCommand = new InstallPreCommitHookCommand();
         $preCommitHookCommand->setChecker($checker);
 
-        $this->application = $this->getMock('Ibuildings\QA\Tools\Common\Application', array('getDialogHelper'), array('ibuildings qa tools', '1.1.16', $settings));
+        $this->application = $this->getMock('Ibuildings\QA\Tools\Common\Application', array('getDialogHelper'), array('ibuildings qa tools', '1.1.17', $settings));
 
         $dialog = $this->getMock('Ibuildings\QA\Tools\Common\Console\Helper\DialogHelper', array('askConfirmation', 'askAndValidate'));
 

diff --git a/src/Ibuildings/QA/tests/Common/Console/RunCommandTest.php b/src/Ibuildings/QA/tests/Common/Console/RunCommandTest.php
@@ -42,7 +42,7 @@ public function setup()
         $preCommitHookCommand = new RunCommand();
         $preCommitHookCommand->setChecker($checker);
 
-        $this->application = new Application('ibuildings qa tools', '1.1.16', $settings);
+        $this->application = new Application('ibuildings qa tools', '1.1.17', $settings);
 
         $this->application->add($preCommitHookCommand);
     }

diff --git a/src/Ibuildings/QA/tests/Common/Console/fixtures/.travis.yml b/src/Ibuildings/QA/tests/Common/Console/fixtures/.travis.yml
@@ -18,12 +18,12 @@ env:
 
 cache:
   directories:
-    - ./vendor
+    - ~/.composer
 
 before_script:
+  - phpenv config-add .travis.php.ini
   - composer self-update
   - composer install --prefer-dist
-  - phpenv config-add .travis.php.ini
 
 script:
   - ant

diff --git a/src/Ibuildings/QA/tests/Javascript/Console/InstallJsHintCommandTest.php b/src/Ibuildings/QA/tests/Javascript/Console/InstallJsHintCommandTest.php
@@ -34,7 +34,7 @@ public function setup()
         $packageBaseDir = realpath(__DIR__ . '/../../../../../../');
         $settings = new Settings($baseDir, $packageBaseDir);
 
-        $this->application = new Application('ibuildings qa tools', '1.1.16', $settings);
+        $this->application = new Application('ibuildings qa tools', '1.1.17', $settings);
 
         /** @var InstallJsHintCommand $command */
         $command = $this->getMock('Ibuildings\QA\tests\mock\InstallJsHintCommand', array('installNpmDependencies'));