From 517a81001f54e31fb30be5700bbfecf2e71c4860 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Gonz=C3=A1lez?= Date: Mon, 8 Jun 2015 10:37:00 +0100 Subject: [PATCH 1/3] updating travis --- .travis.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9746c3a9..86469073 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,22 +13,22 @@ env: - REQUIRE="phpunit/phpunit:3.7.31" matrix: - - DB=mysql CAKE_VERSION=master + - DB=mysql CAKE_VERSION=2.6.6 matrix: include: - php: 5.3 env: - - CAKE_VERSION=master + - CAKE_VERSION=2.6.6 - php: 5.4 env: - - CAKE_VERSION=master + - CAKE_VERSION=2.6.6 - php: 5.5 env: - - CAKE_VERSION=master + - CAKE_VERSION=2.6.6 before_script: - - git clone https://github.com/burzum/travis.git --depth 1 ../travis + - git clone https://github.com/steinkel/travis.git --depth 1 ../travis - ../travis/before_script.sh - if [ "$PHPCS" != 1 ]; then echo " @@ -44,3 +44,4 @@ after_success: notifications: email: false + From ebf6bc60bb40cab95548f11aef8055fa2e2ea290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Gonz=C3=A1lez?= Date: Mon, 8 Jun 2015 11:50:04 +0100 Subject: [PATCH 2/3] using minor for travis CakePHP --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 86469073..75a0ebfc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,19 +13,19 @@ env: - REQUIRE="phpunit/phpunit:3.7.31" matrix: - - DB=mysql CAKE_VERSION=2.6.6 + - DB=mysql CAKE_VERSION=2.6 matrix: include: - php: 5.3 env: - - CAKE_VERSION=2.6.6 + - CAKE_VERSION=2.6 - php: 5.4 env: - - CAKE_VERSION=2.6.6 + - CAKE_VERSION=2.6 - php: 5.5 env: - - CAKE_VERSION=2.6.6 + - CAKE_VERSION=2.6 before_script: - git clone https://github.com/steinkel/travis.git --depth 1 ../travis From 14894963a4864750027fa10d1ee6d2cec815278a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Gonz=C3=A1lez?= Date: Mon, 8 Jun 2015 12:05:13 +0100 Subject: [PATCH 3/3] Revert "fixing unit tests" to pass tests in travis env This reverts commit 27d5afb9a6b56dd6a6c6d9d1c3bd66c1054448a1. --- Test/Case/Console/Command/MigrationShellTest.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Test/Case/Console/Command/MigrationShellTest.php b/Test/Case/Console/Command/MigrationShellTest.php index 5878e176..554173c3 100644 --- a/Test/Case/Console/Command/MigrationShellTest.php +++ b/Test/Case/Console/Command/MigrationShellTest.php @@ -957,12 +957,12 @@ public function testMigrationStatus() { /Migrations Plugin Current version: - #002 002_convert_version_to_class_names + #003 003_increase_class_name_length Latest version: #003 003_increase_class_name_length/ TEXT; $this->assertRegExp(str_replace("\r\n", "\n", $pattern), $result); - $this->Shell->Version->setVersion(2, 'migrations', false); + $this->Shell->Version->setVersion(3, 'migrations', false); $this->Shell->output = ''; $this->Shell->args = array('outdated'); $this->Shell->status(); @@ -971,7 +971,7 @@ public function testMigrationStatus() { /Migrations Plugin Current version: - #001 001_init_migrations + #002 002_convert_version_to_class_names Latest version: #003 003_increase_class_name_length/ TEXT;