euromark 10 年 前
コミット
ae517ad59c
1 ファイル変更5 行追加10 行削除
  1. 5 10
      .travis.yml

+ 5 - 10
.travis.yml

@@ -9,7 +9,7 @@ env:
   global:
   global:
     - REPO_NAME=cakephp-tools
     - REPO_NAME=cakephp-tools
     - PLUGIN_NAME=Tools
     - PLUGIN_NAME=Tools
-    - DB=mysql
+
   matrix:
   matrix:
     - DB=mysql CAKE_VERSION=2.7
     - DB=mysql CAKE_VERSION=2.7
     - DB=mysql CAKE_VERSION=2.8
     - DB=mysql CAKE_VERSION=2.8
@@ -18,16 +18,12 @@ matrix:
   include:
   include:
     - php: 5.4
     - php: 5.4
       env:
       env:
-        - CAKE_VERSION=2.7
-        - COVERALLS=1
-  fast_finish: true
+        - DB=mysql CAKE_VERSION=2.7 COVERALLS=1
 
 
 before_script:
 before_script:
-  - composer global require 'phpunit/phpunit=3.7.33'
-  - git clone https://github.com/FriendsOfCake/travis.git --depth 1 ../travis
+  - git clone -b master https://github.com/FriendsOfCake/travis.git --depth 1 ../travis
   - ../travis/before_script.sh
   - ../travis/before_script.sh
   - cd ../cakephp/app
   - cd ../cakephp/app
-  - ln -s ~/.composer/vendor/phpunit/phpunit/PHPUnit Vendor/PHPUnit
   - echo "Configure::write('Security.salt', 'AxcG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mi');" >> Config/bootstrap.php
   - echo "Configure::write('Security.salt', 'AxcG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mi');" >> Config/bootstrap.php
   - echo "Configure::write('Security.cipherSeed', '16659201697453542496749683615');" >> Config/bootstrap.php
   - echo "Configure::write('Security.cipherSeed', '16659201697453542496749683615');" >> Config/bootstrap.php
   - echo "<?php App::uses('MyModel', 'Tools.Model'); class AppModel extends MyModel {}" > Model/AppModel.php
   - echo "<?php App::uses('MyModel', 'Tools.Model'); class AppModel extends MyModel {}" > Model/AppModel.php
@@ -35,8 +31,7 @@ before_script:
   - echo "<?php App::uses('BaseEmailConfig', 'Tools.Config'); class EmailConfig extends BaseEmailConfig {}" > Config/email.php
   - echo "<?php App::uses('BaseEmailConfig', 'Tools.Config'); class EmailConfig extends BaseEmailConfig {}" > Config/email.php
   - echo "Configure::write('Config.adminEmail', 'example@example.org');" >> Config/bootstrap.php
   - echo "Configure::write('Config.adminEmail', 'example@example.org');" >> Config/bootstrap.php
   - cd ..
   - cd ..
-  - cp ../cakephp-tools/phpunit.xml app/
-
+  
 script:
 script:
   - ../travis/script.sh
   - ../travis/script.sh
 
 
@@ -44,4 +39,4 @@ after_success:
   - ../travis/after_success.sh
   - ../travis/after_success.sh
 
 
 notifications:
 notifications:
-  email: false
+  email: false