From 185ac3fc5b8a5224f48555b7dcf7e540e8502de6 Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Tue, 20 Jan 2015 16:22:40 +0530 Subject: [PATCH 01/10] test-pr --- shippable.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/shippable.yml b/shippable.yml index 817b74f..8d98975 100644 --- a/shippable.yml +++ b/shippable.yml @@ -2,14 +2,12 @@ language: php php: # - 5.3 - - 5.6 - - 5.5 - - 5.4 + # - 5.6 + # - 5.5 + - 5.4 + -before_install: - - source ~/.rvm/scripts/rvm && rvm use 2.0.0 - before_script: - mkdir -p shippable/codecoverage - mkdir -p shippable/testresults From 27bb5685499ac04f02d8d619d5d8027823f5dc34 Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Tue, 20 Jan 2015 16:25:39 +0530 Subject: [PATCH 02/10] Update calculator_test.php --- tests/calculator_test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/calculator_test.php b/tests/calculator_test.php index 73cbbf1..fdcd534 100644 --- a/tests/calculator_test.php +++ b/tests/calculator_test.php @@ -8,7 +8,7 @@ class CalculatorTest extends PHPUnit_Framework_TestCase{ public function testAdd(){ $calc = new Calculator(); $sum = $calc->add(array(2,3,4,5)); - $this->assertEquals(15, $sum); //check if 2+3+4+5 is equal to 14 + $this->assertEquals(14, $sum); //check if 2+3+4+5 is equal to 14 } //test if the subtract() method in our calculator class From fa3e88d421d6045287363ac231b3761cf57f11aa Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Tue, 20 Jan 2015 16:33:45 +0530 Subject: [PATCH 03/10] Update shippable.yml --- shippable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/shippable.yml b/shippable.yml index 8d98975..d764548 100644 --- a/shippable.yml +++ b/shippable.yml @@ -24,6 +24,7 @@ notifications: archive: true #cache: true + branches: only: - master From c3ae4fe61b409444d09d94f2b83b37c813255111 Mon Sep 17 00:00:00 2001 From: csharp Date: Thu, 22 Jan 2015 11:26:40 +0530 Subject: [PATCH 04/10] Update shippable.yml --- shippable.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/shippable.yml b/shippable.yml index d764548..00da3b7 100644 --- a/shippable.yml +++ b/shippable.yml @@ -6,8 +6,6 @@ php: # - 5.5 - 5.4 - - before_script: - mkdir -p shippable/codecoverage - mkdir -p shippable/testresults From 58f416f919586c92997d6a09fbbf10dfc1505d1f Mon Sep 17 00:00:00 2001 From: buildsample Date: Thu, 23 Apr 2015 17:00:32 +0530 Subject: [PATCH 05/10] Update shippable.yml --- shippable.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 00da3b7..2161668 100644 --- a/shippable.yml +++ b/shippable.yml @@ -1,9 +1,10 @@ language: php + php: # - 5.3 # - 5.6 - # - 5.5 + - 5.5 - 5.4 before_script: From 56b0a42377bad94a8b58de359a43d891779f3a68 Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Tue, 18 Aug 2015 13:39:21 +0530 Subject: [PATCH 06/10] Update shippable.yml --- shippable.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/shippable.yml b/shippable.yml index 2161668..1a87e50 100644 --- a/shippable.yml +++ b/shippable.yml @@ -1,6 +1,4 @@ language: php - - php: # - 5.3 # - 5.6 From a07f05e55ca710f7fb0cd0bd9700d8e3e7174f82 Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Wed, 7 Oct 2015 12:39:05 +0530 Subject: [PATCH 07/10] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 1a87e50..19a38a9 100644 --- a/shippable.yml +++ b/shippable.yml @@ -1,7 +1,7 @@ language: php php: # - 5.3 - # - 5.6 + - 5.6 - 5.5 - 5.4 From 7e605b16d821680bc95319cb387bfa4f22999c48 Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Mon, 2 Nov 2015 13:02:02 +0530 Subject: [PATCH 08/10] Update shippable.yml --- shippable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/shippable.yml b/shippable.yml index 19a38a9..fd9ab69 100644 --- a/shippable.yml +++ b/shippable.yml @@ -1,4 +1,5 @@ language: php + php: # - 5.3 - 5.6 From ae1cd15016bb7c683f36d234cbde1a76e1e22fbc Mon Sep 17 00:00:00 2001 From: buildsample Date: Mon, 2 Nov 2015 13:27:05 +0530 Subject: [PATCH 09/10] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fce916d..e6cd407 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ Sample PHP =============== -Build sample for standalone PHP build sample. +Build sample for standalone PHP build sample. merge conflict This sample is built for Shippable, a docker based continuous integration and deployment platform. From 98a728ba09c2411f4eb0c9a2608bc729a28b111d Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Fri, 8 Jan 2016 14:48:22 +0530 Subject: [PATCH 10/10] Update shippable.yml --- shippable.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index fd9ab69..bc568ab 100644 --- a/shippable.yml +++ b/shippable.yml @@ -1,5 +1,6 @@ language: php + php: # - 5.3 - 5.6 @@ -18,7 +19,7 @@ script: notifications: email: - vidya@shippable.com - - vidyac.raghav@gmail.com + # - vidyac.raghav@gmail.com archive: true #cache: true