From 21e8090a92e86646dd9e475eb1baf7042817a972 Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Tue, 1 Jul 2014 12:17:13 +0530 Subject: [PATCH 01/85] Update shippable.yml --- shippable.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/shippable.yml b/shippable.yml index 3e14b92..7d99335 100644 --- a/shippable.yml +++ b/shippable.yml @@ -1,7 +1,11 @@ language: php php: + - 5.3 - 5.4 + - 5.5 + - 5.6 + before_script: - mkdir -p shippable/codecoverage - mkdir -p shippable/testresults From 70b2f5e59d6e5abda38e75ad86b4072cf1adfba3 Mon Sep 17 00:00:00 2001 From: Patrick Ellis Date: Tue, 22 Jul 2014 11:47:24 -0700 Subject: [PATCH 02/85] Update README.md --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2bb6bd0..fce916d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ -php-buildsample +Sample PHP =============== -Build sample for PHP +Build sample for standalone PHP build sample. + +This sample is built for Shippable, a docker based continuous integration and deployment platform. From 8fefb762aa31df56e5d0a34bccfe75518932c7bb Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Wed, 30 Jul 2014 14:55:44 +0530 Subject: [PATCH 03/85] 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 fdcd534..73cbbf1 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(14, $sum); //check if 2+3+4+5 is equal to 14 + $this->assertEquals(15, $sum); //check if 2+3+4+5 is equal to 14 } //test if the subtract() method in our calculator class From 52bfcace7c3ec02c9d3b98098adef31589d00a43 Mon Sep 17 00:00:00 2001 From: Vidya3 Date: Wed, 30 Jul 2014 14:58:17 +0530 Subject: [PATCH 04/85] Update shippable.yml --- shippable.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shippable.yml b/shippable.yml index 7d99335..f4c5a52 100644 --- a/shippable.yml +++ b/shippable.yml @@ -1,9 +1,9 @@ language: php php: - - 5.3 - - 5.4 - - 5.5 + #- 5.3 + #- 5.4 + #- 5.5 - 5.6 before_script: From f384110af3f1956ac0696d8559f91f861f9a171d Mon Sep 17 00:00:00 2001 From: Vidya3 Date: Wed, 30 Jul 2014 14:58:46 +0530 Subject: [PATCH 05/85] 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 c61aa2d45ff6086ef654e46c5235759f5872522a Mon Sep 17 00:00:00 2001 From: Vidya3 Date: Sun, 3 Aug 2014 14:46:57 +0530 Subject: [PATCH 06/85] Update calculator.php --- calculator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calculator.php b/calculator.php index 1011055..b12d73f 100644 --- a/calculator.php +++ b/calculator.php @@ -10,7 +10,7 @@ public function add($numbers_to_add){ } public function subtract($x, $y){ - return $x - $y; + return $x + $y; } public function multiply($numbers_to_multiply){ From d7c689868f440ac0a3afdf68a75ec4c7d0830e47 Mon Sep 17 00:00:00 2001 From: Vidya3 Date: Sun, 3 Aug 2014 14:51:14 +0530 Subject: [PATCH 07/85] Update calculator.php --- calculator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calculator.php b/calculator.php index b12d73f..1011055 100644 --- a/calculator.php +++ b/calculator.php @@ -10,7 +10,7 @@ public function add($numbers_to_add){ } public function subtract($x, $y){ - return $x + $y; + return $x - $y; } public function multiply($numbers_to_multiply){ From e5d7176c0e1820ba67882f4e2b5c056769612a18 Mon Sep 17 00:00:00 2001 From: Vidya3 Date: Sun, 3 Aug 2014 14:55:29 +0530 Subject: [PATCH 08/85] 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 fdcd534..ff7e42a 100644 --- a/tests/calculator_test.php +++ b/tests/calculator_test.php @@ -17,7 +17,7 @@ public function testAdd(){ public function testSubtract(){ $calc = new Calculator(); $difference = $calc->subtract(5,2); - $this->assertEquals(3, $difference); //check if 5 - 2 is equal to 3 + $this->assertEquals(2, $difference); //check if 5 - 2 is equal to 3 } //test if the multiply() method in our calculator class From 398ea74e74a27e5b7209f60afea7f6aec8c0bbd2 Mon Sep 17 00:00:00 2001 From: Vidya3 Date: Sun, 3 Aug 2014 14:57:29 +0530 Subject: [PATCH 09/85] Update shippable.yml --- shippable.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index f4c5a52..9c11285 100644 --- a/shippable.yml +++ b/shippable.yml @@ -12,7 +12,8 @@ before_script: script: - phpunit --log-junit shippable/testresults/junit.xml --coverage-xml shippable/codecoverage tests/calculator_test.php - + - git rev-parse --abbrev-ref HEAD + notifications: email: false From 94791bc15b4cab8df86087c986af6e1cd2818c9a Mon Sep 17 00:00:00 2001 From: Vidya3 Date: Sun, 3 Aug 2014 14:58:45 +0530 Subject: [PATCH 10/85] 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 ff7e42a..fdcd534 100644 --- a/tests/calculator_test.php +++ b/tests/calculator_test.php @@ -17,7 +17,7 @@ public function testAdd(){ public function testSubtract(){ $calc = new Calculator(); $difference = $calc->subtract(5,2); - $this->assertEquals(2, $difference); //check if 5 - 2 is equal to 3 + $this->assertEquals(3, $difference); //check if 5 - 2 is equal to 3 } //test if the multiply() method in our calculator class From dda84744652754fd54a3e01e68d0d6ee8746d6b2 Mon Sep 17 00:00:00 2001 From: vidyaraghav Date: Mon, 15 Sep 2014 16:36:45 +0530 Subject: [PATCH 11/85] 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 fdcd534..73cbbf1 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(14, $sum); //check if 2+3+4+5 is equal to 14 + $this->assertEquals(15, $sum); //check if 2+3+4+5 is equal to 14 } //test if the subtract() method in our calculator class From d17c492b1e01cd3f33d1b6d0b4fcc7ba675eea7d Mon Sep 17 00:00:00 2001 From: vidyaraghav Date: Mon, 15 Sep 2014 16:39:02 +0530 Subject: [PATCH 12/85] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 9c11285..01350cb 100644 --- a/shippable.yml +++ b/shippable.yml @@ -3,7 +3,7 @@ language: php php: #- 5.3 #- 5.4 - #- 5.5 + - 5.5 - 5.6 before_script: From b0925a867873ba9249274ff2924b84a11ecab34b Mon Sep 17 00:00:00 2001 From: vidyaraghav Date: Mon, 15 Sep 2014 16:41:18 +0530 Subject: [PATCH 13/85] Update shippable.yml --- shippable.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shippable.yml b/shippable.yml index 01350cb..65cd9dd 100644 --- a/shippable.yml +++ b/shippable.yml @@ -1,8 +1,8 @@ language: php php: - #- 5.3 - #- 5.4 + - 5.3 + - 5.4 - 5.5 - 5.6 From e0bedaec2cc8c5a85e212ff54cd8aacfb8ec6c66 Mon Sep 17 00:00:00 2001 From: vidyaraghav Date: Mon, 15 Sep 2014 17:14:52 +0530 Subject: [PATCH 14/85] Update shippable.yml --- shippable.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shippable.yml b/shippable.yml index 65cd9dd..1f56cd5 100644 --- a/shippable.yml +++ b/shippable.yml @@ -1,10 +1,10 @@ language: php php: - - 5.3 + # - 5.3 - 5.4 - 5.5 - - 5.6 +# - 5.6 before_script: - mkdir -p shippable/codecoverage From e70765d7a75ffe7489681293d2da6f0082f57e39 Mon Sep 17 00:00:00 2001 From: vidyaraghav Date: Mon, 15 Sep 2014 17:17:09 +0530 Subject: [PATCH 15/85] Update shippable.yml --- shippable.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shippable.yml b/shippable.yml index 1f56cd5..7117db1 100644 --- a/shippable.yml +++ b/shippable.yml @@ -2,9 +2,9 @@ language: php php: # - 5.3 - - 5.4 + - 5.6 - 5.5 -# - 5.6 + - 5.4 before_script: - mkdir -p shippable/codecoverage From 2cafbd6b749fdeec695f866f1c9d0bdcfadfe11a Mon Sep 17 00:00:00 2001 From: vidyaraghav Date: Mon, 15 Sep 2014 17:20:24 +0530 Subject: [PATCH 16/85] Update shippable.yml --- shippable.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/shippable.yml b/shippable.yml index 7117db1..1399c0a 100644 --- a/shippable.yml +++ b/shippable.yml @@ -2,9 +2,9 @@ language: php php: # - 5.3 - - 5.6 + #- 5.6 - 5.5 - - 5.4 + #- 5.4 before_script: - mkdir -p shippable/codecoverage @@ -14,7 +14,3 @@ script: - phpunit --log-junit shippable/testresults/junit.xml --coverage-xml shippable/codecoverage tests/calculator_test.php - git rev-parse --abbrev-ref HEAD -notifications: - email: false - - From edf8893edb927ab079b1c745e8c5ecef933dcf1d Mon Sep 17 00:00:00 2001 From: vidyaraghav Date: Mon, 15 Sep 2014 17:49:42 +0530 Subject: [PATCH 17/85] 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 04e9fc8cba6615d972e0b1f0b7a0b66d9cbe510e Mon Sep 17 00:00:00 2001 From: vidyaraghav Date: Mon, 15 Sep 2014 17:50:08 +0530 Subject: [PATCH 18/85] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 1399c0a..1fe7fe7 100644 --- a/shippable.yml +++ b/shippable.yml @@ -4,7 +4,7 @@ php: # - 5.3 #- 5.6 - 5.5 - #- 5.4 + - 5.4 before_script: - mkdir -p shippable/codecoverage From 9ce287031ddba2bc9861adfe4773a155f9b0a4b8 Mon Sep 17 00:00:00 2001 From: vidyaraghav Date: Mon, 15 Sep 2014 17:52:02 +0530 Subject: [PATCH 19/85] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 1fe7fe7..9176387 100644 --- a/shippable.yml +++ b/shippable.yml @@ -2,7 +2,7 @@ language: php php: # - 5.3 - #- 5.6 + - 5.6 - 5.5 - 5.4 From 6f56fe9d1f9aa51ae4997626468e3fab38d0a8f2 Mon Sep 17 00:00:00 2001 From: vidyaraghav Date: Mon, 15 Sep 2014 17:54:21 +0530 Subject: [PATCH 20/85] Update shippable.yml --- shippable.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/shippable.yml b/shippable.yml index 9176387..7fe8cdb 100644 --- a/shippable.yml +++ b/shippable.yml @@ -14,3 +14,7 @@ script: - phpunit --log-junit shippable/testresults/junit.xml --coverage-xml shippable/codecoverage tests/calculator_test.php - git rev-parse --abbrev-ref HEAD +notifications: + email: + - vidya@shippable.com + - vidyac.raghav@gmail.com From 7969c49cdc76c1d3451e6caa0b2a0935edff35d5 Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Tue, 16 Sep 2014 12:39:26 +0530 Subject: [PATCH 21/85] Update shippable.yml --- shippable.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 7fe8cdb..303a139 100644 --- a/shippable.yml +++ b/shippable.yml @@ -12,9 +12,10 @@ before_script: script: - phpunit --log-junit shippable/testresults/junit.xml --coverage-xml shippable/codecoverage tests/calculator_test.php - - git rev-parse --abbrev-ref HEAD + #- git rev-parse --abbrev-ref HEAD notifications: email: - vidya@shippable.com - vidyac.raghav@gmail.com +archive: true From 378c8176a3459d9b8e8f8140a22e8fb67d650d6a Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Tue, 16 Sep 2014 12:50:52 +0530 Subject: [PATCH 22/85] 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 fdcd534..524df5f 100644 --- a/tests/calculator_test.php +++ b/tests/calculator_test.php @@ -17,7 +17,7 @@ public function testAdd(){ public function testSubtract(){ $calc = new Calculator(); $difference = $calc->subtract(5,2); - $this->assertEquals(3, $difference); //check if 5 - 2 is equal to 3 + $this->assertEquals(4, $difference); //check if 5 - 2 is equal to 3 } //test if the multiply() method in our calculator class From 3e77b7b30e98bf3f5efa5d3b20b71d003378aad4 Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Tue, 16 Sep 2014 12:54:08 +0530 Subject: [PATCH 23/85] 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 524df5f..48626dd 100644 --- a/tests/calculator_test.php +++ b/tests/calculator_test.php @@ -16,7 +16,7 @@ public function testAdd(){ //were expecting public function testSubtract(){ $calc = new Calculator(); - $difference = $calc->subtract(5,2); + $difference = $calc->subtract(3,2); $this->assertEquals(4, $difference); //check if 5 - 2 is equal to 3 } From 3be518491c1489f3657c8eefb8d52c732deb558d Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Tue, 16 Sep 2014 12:59:40 +0530 Subject: [PATCH 24/85] Update calculator_test.php --- tests/calculator_test.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/calculator_test.php b/tests/calculator_test.php index 48626dd..fdcd534 100644 --- a/tests/calculator_test.php +++ b/tests/calculator_test.php @@ -16,8 +16,8 @@ public function testAdd(){ //were expecting public function testSubtract(){ $calc = new Calculator(); - $difference = $calc->subtract(3,2); - $this->assertEquals(4, $difference); //check if 5 - 2 is equal to 3 + $difference = $calc->subtract(5,2); + $this->assertEquals(3, $difference); //check if 5 - 2 is equal to 3 } //test if the multiply() method in our calculator class From a34cc2eef8278d94f7a476950cc1525587594daf Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Wed, 17 Sep 2014 13:24:45 +0530 Subject: [PATCH 25/85] Update shippable.yml --- shippable.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shippable.yml b/shippable.yml index 303a139..a3c684d 100644 --- a/shippable.yml +++ b/shippable.yml @@ -2,8 +2,8 @@ language: php php: # - 5.3 - - 5.6 - - 5.5 + #- 5.6 + #- 5.5 - 5.4 before_script: From de52896e3b5cac3bd2a0f1d4d0c8003a5b2b3f75 Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Wed, 17 Sep 2014 13:25:09 +0530 Subject: [PATCH 26/85] 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 fdcd534..73cbbf1 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(14, $sum); //check if 2+3+4+5 is equal to 14 + $this->assertEquals(15, $sum); //check if 2+3+4+5 is equal to 14 } //test if the subtract() method in our calculator class From aaf0e6cf869a4ceb10d68cdeeb53ceed96367920 Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Wed, 17 Sep 2014 13:27:15 +0530 Subject: [PATCH 27/85] Update shippable.yml --- shippable.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shippable.yml b/shippable.yml index a3c684d..8d6feee 100644 --- a/shippable.yml +++ b/shippable.yml @@ -3,8 +3,8 @@ language: php php: # - 5.3 #- 5.6 - #- 5.5 - - 5.4 + - 5.5 + - 5.4 before_script: - mkdir -p shippable/codecoverage From 3c373c306884f2561f201bd51817c30b5a23e8f9 Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Wed, 17 Sep 2014 14:42:10 +0530 Subject: [PATCH 28/85] Update shippable.yml --- shippable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/shippable.yml b/shippable.yml index 8d6feee..bad7b9f 100644 --- a/shippable.yml +++ b/shippable.yml @@ -9,6 +9,7 @@ php: before_script: - mkdir -p shippable/codecoverage - mkdir -p shippable/testresults + - printenv script: - phpunit --log-junit shippable/testresults/junit.xml --coverage-xml shippable/codecoverage tests/calculator_test.php From 2e5778c42841a766c4858a861c9a19cb8210597b Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Thu, 18 Sep 2014 13:36:48 +0530 Subject: [PATCH 29/85] 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 28880ed785a3a374a7328522ef4bc55f19d09cfe Mon Sep 17 00:00:00 2001 From: csharp Date: Thu, 18 Sep 2014 13:38:53 +0530 Subject: [PATCH 30/85] 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 fdcd534..2309f26 100644 --- a/tests/calculator_test.php +++ b/tests/calculator_test.php @@ -26,7 +26,7 @@ public function testSubtract(){ public function testMultiply(){ $calc = new Calculator(); $product = $calc->multiply(array(1,3,5,6)); - $this->assertEquals(90, $product); //check if 1*3*5*6 is equal to 90 + $this->assertEquals(91, $product); //check if 1*3*5*6 is equal to 90 } //test if the divide() method in our calculator class From 1969731123cf82ac563f99e4ca22796048560357 Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Thu, 25 Sep 2014 13:06:43 +0530 Subject: [PATCH 31/85] updated sample to test passing cases in git --- 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 2309f26..fdcd534 100644 --- a/tests/calculator_test.php +++ b/tests/calculator_test.php @@ -26,7 +26,7 @@ public function testSubtract(){ public function testMultiply(){ $calc = new Calculator(); $product = $calc->multiply(array(1,3,5,6)); - $this->assertEquals(91, $product); //check if 1*3*5*6 is equal to 90 + $this->assertEquals(90, $product); //check if 1*3*5*6 is equal to 90 } //test if the divide() method in our calculator class From 56f5e7fa965c91d838d60cc751d139ec6e4bbf30 Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Thu, 25 Sep 2014 13:12:15 +0530 Subject: [PATCH 32/85] 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 fdcd534..524df5f 100644 --- a/tests/calculator_test.php +++ b/tests/calculator_test.php @@ -17,7 +17,7 @@ public function testAdd(){ public function testSubtract(){ $calc = new Calculator(); $difference = $calc->subtract(5,2); - $this->assertEquals(3, $difference); //check if 5 - 2 is equal to 3 + $this->assertEquals(4, $difference); //check if 5 - 2 is equal to 3 } //test if the multiply() method in our calculator class From 96bed44bced98a4c28cf9182169781b5cb04611e Mon Sep 17 00:00:00 2001 From: vidyaraghav Date: Mon, 6 Oct 2014 13:06:35 +0530 Subject: [PATCH 33/85] Update shippable.yml --- shippable.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index bad7b9f..36acb63 100644 --- a/shippable.yml +++ b/shippable.yml @@ -2,7 +2,7 @@ language: php php: # - 5.3 - #- 5.6 + - 5.6 - 5.5 - 5.4 @@ -19,4 +19,5 @@ notifications: email: - vidya@shippable.com - vidyac.raghav@gmail.com + archive: true From a3af504df4efd3989d9cc60eb5532ae18bdee442 Mon Sep 17 00:00:00 2001 From: csharp Date: Tue, 7 Oct 2014 12:16:46 +0530 Subject: [PATCH 34/85] 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 524df5f..fdcd534 100644 --- a/tests/calculator_test.php +++ b/tests/calculator_test.php @@ -17,7 +17,7 @@ public function testAdd(){ public function testSubtract(){ $calc = new Calculator(); $difference = $calc->subtract(5,2); - $this->assertEquals(4, $difference); //check if 5 - 2 is equal to 3 + $this->assertEquals(3, $difference); //check if 5 - 2 is equal to 3 } //test if the multiply() method in our calculator class From 3624a41077cf267d71a8a4f5bcd2a85acba40d5b Mon Sep 17 00:00:00 2001 From: csharp Date: Tue, 7 Oct 2014 12:17:09 +0530 Subject: [PATCH 35/85] Update shippable.yml --- shippable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/shippable.yml b/shippable.yml index 36acb63..234581d 100644 --- a/shippable.yml +++ b/shippable.yml @@ -21,3 +21,4 @@ notifications: - vidyac.raghav@gmail.com archive: true +cache: true From 7e46d2d4acb997f6271063ea2b622ae09b6e4eb8 Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Mon, 19 Jan 2015 16:48:12 +0530 Subject: [PATCH 36/85] Update shippable.yml --- shippable.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 234581d..865f408 100644 --- a/shippable.yml +++ b/shippable.yml @@ -5,7 +5,11 @@ php: - 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 388b253264443b739479906b6493d29c66327f11 Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Mon, 19 Jan 2015 22:29:22 +0530 Subject: [PATCH 37/85] Update calculator.php --- calculator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calculator.php b/calculator.php index 1011055..df37042 100644 --- a/calculator.php +++ b/calculator.php @@ -2,7 +2,7 @@ class Calculator{ public function add($numbers_to_add){ - $sum = 0; + $sum = 1; foreach($numbers_to_add as $num){ $sum = $num + $sum; } From 2532eaff45883d8ca47330bfdc1fcb8c46135ffe Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Mon, 19 Jan 2015 22:30:05 +0530 Subject: [PATCH 38/85] 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 fdcd534..73cbbf1 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(14, $sum); //check if 2+3+4+5 is equal to 14 + $this->assertEquals(15, $sum); //check if 2+3+4+5 is equal to 14 } //test if the subtract() method in our calculator class From 2e70ee17d553d4cd6bb23fb2530e05837344b50e Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Tue, 20 Jan 2015 16:04:25 +0530 Subject: [PATCH 39/85] Update shippable.yml --- shippable.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/shippable.yml b/shippable.yml index 865f408..67da127 100644 --- a/shippable.yml +++ b/shippable.yml @@ -26,3 +26,6 @@ notifications: archive: true cache: true +branches: + only: + - master From 37aad39911c7933f08df2a8523d2ddc0b4c05283 Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Tue, 20 Jan 2015 16:05:18 +0530 Subject: [PATCH 40/85] [reset_minion] --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 67da127..817b74f 100644 --- a/shippable.yml +++ b/shippable.yml @@ -25,7 +25,7 @@ notifications: - vidyac.raghav@gmail.com archive: true -cache: true +#cache: true branches: only: - master From 24168c7826719065e5e80801a3b2bd8136d7d693 Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Tue, 20 Jan 2015 16:24:48 +0530 Subject: [PATCH 41/85] Update calculator.php --- calculator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calculator.php b/calculator.php index df37042..1011055 100644 --- a/calculator.php +++ b/calculator.php @@ -2,7 +2,7 @@ class Calculator{ public function add($numbers_to_add){ - $sum = 1; + $sum = 0; foreach($numbers_to_add as $num){ $sum = $num + $sum; } From 9efc316874e11764605cbae9f3c2a401e854cd81 Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Tue, 20 Jan 2015 16:32:09 +0530 Subject: [PATCH 42/85] Update shippable.yml --- shippable.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 817b74f..6273f51 100644 --- a/shippable.yml +++ b/shippable.yml @@ -8,7 +8,8 @@ php: before_install: - - source ~/.rvm/scripts/rvm && rvm use 2.0.0 + - source ~/.rvm/scripts/rvm && rvm use 1.9.3 + before_script: - mkdir -p shippable/codecoverage From 3d1a8f460a59350cbe908004ce13e6bdf0617972 Mon Sep 17 00:00:00 2001 From: csharp Date: Tue, 10 Feb 2015 15:52:47 +0530 Subject: [PATCH 43/85] 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..fdeb0c1 100644 --- a/tests/calculator_test.php +++ b/tests/calculator_test.php @@ -17,7 +17,7 @@ public function testAdd(){ public function testSubtract(){ $calc = new Calculator(); $difference = $calc->subtract(5,2); - $this->assertEquals(3, $difference); //check if 5 - 2 is equal to 3 + $this->assertEquals(2, $difference); //check if 5 - 2 is equal to 3 } //test if the multiply() method in our calculator class From f79fd9dd0a43d3bf5998b2a0466a04e1efbb8a10 Mon Sep 17 00:00:00 2001 From: csharp Date: Tue, 10 Feb 2015 15:56:46 +0530 Subject: [PATCH 44/85] 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 fdeb0c1..73cbbf1 100644 --- a/tests/calculator_test.php +++ b/tests/calculator_test.php @@ -17,7 +17,7 @@ public function testAdd(){ public function testSubtract(){ $calc = new Calculator(); $difference = $calc->subtract(5,2); - $this->assertEquals(2, $difference); //check if 5 - 2 is equal to 3 + $this->assertEquals(3, $difference); //check if 5 - 2 is equal to 3 } //test if the multiply() method in our calculator class From f834f859581e9171b96ec2edcbe8fb1cb318e39d Mon Sep 17 00:00:00 2001 From: csharp Date: Tue, 10 Feb 2015 15:58:28 +0530 Subject: [PATCH 45/85] 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 e9591c409e54f92229e44102b78f5cd0f66a882c Mon Sep 17 00:00:00 2001 From: csharp Date: Tue, 10 Feb 2015 15:59:10 +0530 Subject: [PATCH 46/85] Update shippable.yml --- shippable.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 6273f51..9c83dc9 100644 --- a/shippable.yml +++ b/shippable.yml @@ -26,7 +26,8 @@ notifications: - vidyac.raghav@gmail.com archive: true -#cache: true +cache: true branches: only: - master + - shippable From bb0cc4968bc76bd15230d9c3e0c2e6212beab89c Mon Sep 17 00:00:00 2001 From: csharp Date: Tue, 10 Feb 2015 16:08:08 +0530 Subject: [PATCH 47/85] Update shippable.yml --- shippable.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/shippable.yml b/shippable.yml index 9c83dc9..fc73f6a 100644 --- a/shippable.yml +++ b/shippable.yml @@ -26,8 +26,8 @@ notifications: - vidyac.raghav@gmail.com archive: true -cache: true +#cache: true branches: - only: - - master - - shippable + except: + #- shippable + - dev_shippable From 2b439ff1a9c35c4fb2d372992e9dc7b265b17962 Mon Sep 17 00:00:00 2001 From: csharp Date: Tue, 10 Feb 2015 16:08:31 +0530 Subject: [PATCH 48/85] Update shippable.yml --- shippable.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/shippable.yml b/shippable.yml index fc73f6a..8bcf875 100644 --- a/shippable.yml +++ b/shippable.yml @@ -26,8 +26,3 @@ notifications: - vidyac.raghav@gmail.com archive: true -#cache: true -branches: - except: - #- shippable - - dev_shippable From fd74d5adcf50af9351f17cdf349aa7f6dfae64ab Mon Sep 17 00:00:00 2001 From: csharp Date: Tue, 10 Feb 2015 16:10:33 +0530 Subject: [PATCH 49/85] Update calculator_test.php --- tests/calculator_test.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/calculator_test.php b/tests/calculator_test.php index fdeb0c1..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 @@ -17,7 +17,7 @@ public function testAdd(){ public function testSubtract(){ $calc = new Calculator(); $difference = $calc->subtract(5,2); - $this->assertEquals(2, $difference); //check if 5 - 2 is equal to 3 + $this->assertEquals(3, $difference); //check if 5 - 2 is equal to 3 } //test if the multiply() method in our calculator class From 25c95d37fa036111700c3d501afc5338e98e7102 Mon Sep 17 00:00:00 2001 From: csharp Date: Tue, 10 Feb 2015 16:14:00 +0530 Subject: [PATCH 50/85] Update shippable.yml --- shippable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/shippable.yml b/shippable.yml index 9c83dc9..7e520ed 100644 --- a/shippable.yml +++ b/shippable.yml @@ -6,6 +6,7 @@ php: - 5.5 - 5.4 +archive: true before_install: - source ~/.rvm/scripts/rvm && rvm use 1.9.3 From 7d51c23682274c64e1d2d184fc6ea4753d532bb5 Mon Sep 17 00:00:00 2001 From: csharp Date: Tue, 10 Feb 2015 16:17:37 +0530 Subject: [PATCH 51/85] cache --- shippable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/shippable.yml b/shippable.yml index 8bcf875..954c449 100644 --- a/shippable.yml +++ b/shippable.yml @@ -26,3 +26,4 @@ notifications: - vidyac.raghav@gmail.com archive: true +cache: true From ae22cf1ff34bd80d18428977b52547cc6f83ec9b Mon Sep 17 00:00:00 2001 From: csharp Date: Tue, 10 Feb 2015 16:23:43 +0530 Subject: [PATCH 52/85] [reset_minion] --- shippable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/shippable.yml b/shippable.yml index 954c449..54b8f95 100644 --- a/shippable.yml +++ b/shippable.yml @@ -26,4 +26,5 @@ notifications: - vidyac.raghav@gmail.com archive: true + cache: true From 1a91ca49ad913bab20a1d2b5c66b7b9d2f632bee Mon Sep 17 00:00:00 2001 From: csharp Date: Tue, 10 Feb 2015 16:27:52 +0530 Subject: [PATCH 53/85] [reset_minion] --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 54b8f95..1f3b646 100644 --- a/shippable.yml +++ b/shippable.yml @@ -8,7 +8,7 @@ php: before_install: - - source ~/.rvm/scripts/rvm && rvm use 1.9.3 + - source ~/.rvm/scripts/rvm && rvm use 1.9.2 before_script: From 259f879633de49a9a926e134e6a24e5d83ee9cb6 Mon Sep 17 00:00:00 2001 From: csharp Date: Tue, 10 Feb 2015 16:32:36 +0530 Subject: [PATCH 54/85] [reset_minion] --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 701f05b..820b5ae 100644 --- a/shippable.yml +++ b/shippable.yml @@ -1,7 +1,7 @@ language: php php: - # - 5.3 + - 5.3 - 5.6 - 5.5 - 5.4 From c5029d9970499fde34bf1764906dc87a2cd0c001 Mon Sep 17 00:00:00 2001 From: csharp Date: Tue, 10 Feb 2015 18:27:53 +0530 Subject: [PATCH 55/85] [reset_minion] --- shippable.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shippable.yml b/shippable.yml index 701f05b..f37c39d 100644 --- a/shippable.yml +++ b/shippable.yml @@ -19,11 +19,11 @@ before_script: script: - phpunit --log-junit shippable/testresults/junit.xml --coverage-xml shippable/codecoverage tests/calculator_test.php - #- git rev-parse --abbrev-ref HEAD + - git rev-parse --abbrev-ref HEAD notifications: email: - - vidya@shippable.com + # - vidya@shippable.com - vidyac.raghav@gmail.com archive: true From b8514c87ba853680c955b00fa8fafacef0d762aa Mon Sep 17 00:00:00 2001 From: csharp Date: Mon, 16 Feb 2015 17:03:44 +0530 Subject: [PATCH 56/85] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 820b5ae..715cda7 100644 --- a/shippable.yml +++ b/shippable.yml @@ -9,7 +9,7 @@ php: archive: true before_install: - - source ~/.rvm/scripts/rvm && rvm use 1.9.2 + - source ~/.rvm/scripts/rvm && rvm use 1.9.3 before_script: From 63e48955c8ce5db0a736b4c1bf208a7e99fed838 Mon Sep 17 00:00:00 2001 From: csharp Date: Mon, 16 Feb 2015 17:10:39 +0530 Subject: [PATCH 57/85] Update shippable.yml --- shippable.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/shippable.yml b/shippable.yml index f37c39d..8d568b6 100644 --- a/shippable.yml +++ b/shippable.yml @@ -29,3 +29,8 @@ notifications: archive: true cache: true + +branches: + only: + - shippable + - travis From 69a2382e2f66d7e2b4d319fb7afcae3a8320832a Mon Sep 17 00:00:00 2001 From: csharp Date: Mon, 16 Feb 2015 17:12:18 +0530 Subject: [PATCH 58/85] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 8d568b6..4179216 100644 --- a/shippable.yml +++ b/shippable.yml @@ -31,6 +31,6 @@ archive: true cache: true branches: - only: + except: - shippable - travis From bfc403a50fe60fb356efc6b376f5ced354d3c596 Mon Sep 17 00:00:00 2001 From: csharp Date: Tue, 24 Feb 2015 17:22:18 +0530 Subject: [PATCH 59/85] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 965ea04..0e42915 100644 --- a/shippable.yml +++ b/shippable.yml @@ -9,7 +9,7 @@ php: archive: true before_install: - - source ~/.rvm/scripts/rvm && rvm use 1.9.3 + - source ~/.rvm/scripts/rvm && rvm use 1.9.2 before_script: From 0751e344a335d610324d3a5aaf040868deb953c2 Mon Sep 17 00:00:00 2001 From: csharp Date: Tue, 24 Feb 2015 17:31:08 +0530 Subject: [PATCH 60/85] Update calculator.php --- calculator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calculator.php b/calculator.php index 1011055..f0efe56 100644 --- a/calculator.php +++ b/calculator.php @@ -10,7 +10,7 @@ public function add($numbers_to_add){ } public function subtract($x, $y){ - return $x - $y; + return $x - $x; } public function multiply($numbers_to_multiply){ From d787a1fc48c730f2047e6ec35955fab4e269aef7 Mon Sep 17 00:00:00 2001 From: csharp Date: Tue, 24 Feb 2015 17:40:17 +0530 Subject: [PATCH 61/85] Update calculator.php --- calculator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calculator.php b/calculator.php index f0efe56..1011055 100644 --- a/calculator.php +++ b/calculator.php @@ -10,7 +10,7 @@ public function add($numbers_to_add){ } public function subtract($x, $y){ - return $x - $x; + return $x - $y; } public function multiply($numbers_to_multiply){ From ce1d00b5c4f8ad55bcceaae52118908b02a326e1 Mon Sep 17 00:00:00 2001 From: buildsample Date: Wed, 25 Feb 2015 16:30:06 +0530 Subject: [PATCH 62/85] Update shippable.yml --- shippable.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/shippable.yml b/shippable.yml index 0e42915..ab355ac 100644 --- a/shippable.yml +++ b/shippable.yml @@ -1,5 +1,6 @@ language: php + php: - 5.3 - 5.6 @@ -21,6 +22,7 @@ script: - phpunit --log-junit shippable/testresults/junit.xml --coverage-xml shippable/codecoverage tests/calculator_test.php - git rev-parse --abbrev-ref HEAD + notifications: email: # - vidya@shippable.com @@ -34,3 +36,4 @@ branches: except: - shippable - travis + - aa-testing/-1 From a3c676b359104377cf6ad3e44456061437128d57 Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Wed, 18 Mar 2015 14:30:36 +0530 Subject: [PATCH 63/85] Update shippable.yml --- shippable.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 965ea04..a273bae 100644 --- a/shippable.yml +++ b/shippable.yml @@ -11,11 +11,14 @@ archive: true before_install: - source ~/.rvm/scripts/rvm && rvm use 1.9.3 - +env: + - secure: c8Mhtx5/8SqzIQNgXwkvFfeVrib7lbzF9EgZFfETm2bPBtdaM2EyoVT8WlOdp/Ga3+RpmQzL3DmnWx+fppS790QrGnW3bdI6X8zi0EGRXxqP4YjCpxXkcg31RMEOoYamEu55vav/00tXGcN6I1OoQU+6dH+SQ+5qqdQQ5gFyf9JRvcg13b3+7YmQLLswUZq8MRkk0ifNEKRQy5+Fc3bPn9ePoR8rw3f0WOO4q1G9IgEUdmeV1wxdKcjMKu0wgixDjGgy5lABr12uh99EnLvN90Hjucg26ouRvfkICe4SvCEbFduIEL9IppVYyLo9io/in1iD7AoPZCOaXNz7OYg6eg== + before_script: - mkdir -p shippable/codecoverage - mkdir -p shippable/testresults - printenv + - echo $test script: - phpunit --log-junit shippable/testresults/junit.xml --coverage-xml shippable/codecoverage tests/calculator_test.php From 77b302184e57f1055d65b524a1b90f265feb7d25 Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Wed, 18 Mar 2015 14:59:14 +0530 Subject: [PATCH 64/85] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index fce916d..4c0d691 100644 --- a/README.md +++ b/README.md @@ -4,3 +4,4 @@ Sample PHP Build sample for standalone PHP build sample. This sample is built for Shippable, a docker based continuous integration and deployment platform. +[![Build Status](https://apibeta.shippable.com/projects/54c0a79391426fd6a78ca352/badge?branchName=master)](https://appbeta.shippable.com/projects/54c0a79391426fd6a78ca352/builds/latest) From 44375cfff31a031ca4b15e04b085accf8b4c2040 Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Wed, 18 Mar 2015 15:24:03 +0530 Subject: [PATCH 65/85] Update shippable.yml --- shippable.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shippable.yml b/shippable.yml index ab355ac..61f4840 100644 --- a/shippable.yml +++ b/shippable.yml @@ -9,6 +9,8 @@ php: archive: true + + before_install: - source ~/.rvm/scripts/rvm && rvm use 1.9.2 From 916198532572b3c9345bac0b6fa89606c69334f4 Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Wed, 18 Mar 2015 15:24:36 +0530 Subject: [PATCH 66/85] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 61f4840..08248c8 100644 --- a/shippable.yml +++ b/shippable.yml @@ -12,7 +12,7 @@ archive: true before_install: - - source ~/.rvm/scripts/rvm && rvm use 1.9.2 + - source ~/.rvm/scripts/rvm && rvm use 1.9.3 before_script: From 8cea1d76617c2a09119b009bba20932dd68fa2ca Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Wed, 18 Mar 2015 15:25:07 +0530 Subject: [PATCH 67/85] Update shippable.yml --- shippable.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/shippable.yml b/shippable.yml index 08248c8..c46e424 100644 --- a/shippable.yml +++ b/shippable.yml @@ -8,9 +8,6 @@ php: - 5.4 archive: true - - - before_install: - source ~/.rvm/scripts/rvm && rvm use 1.9.3 From 1181e2087a4149abc1908f7a4c58a135941fd9c6 Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Wed, 18 Mar 2015 15:25:46 +0530 Subject: [PATCH 68/85] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index fce916d..d78dd0e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ Sample PHP =============== + +Test Build sample for standalone PHP build sample. This sample is built for Shippable, a docker based continuous integration and deployment platform. From ce4820813e68a857094a8b8c04f785ad6683bc74 Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Wed, 18 Mar 2015 15:26:20 +0530 Subject: [PATCH 69/85] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index d78dd0e..f6975a4 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ Sample PHP Test +Test2 Build sample for standalone PHP build sample. This sample is built for Shippable, a docker based continuous integration and deployment platform. From 869b784053db072133b70a37a852da01017296b4 Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Wed, 18 Mar 2015 15:27:52 +0530 Subject: [PATCH 70/85] Update shippable.yml --- shippable.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shippable.yml b/shippable.yml index c46e424..a9ea191 100644 --- a/shippable.yml +++ b/shippable.yml @@ -8,6 +8,8 @@ php: - 5.4 archive: true + + before_install: - source ~/.rvm/scripts/rvm && rvm use 1.9.3 From a387e3e395751baf21b9c063fb2c4797796371ac Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Wed, 18 Mar 2015 15:28:26 +0530 Subject: [PATCH 71/85] 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 fdcd534..73cbbf1 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(14, $sum); //check if 2+3+4+5 is equal to 14 + $this->assertEquals(15, $sum); //check if 2+3+4+5 is equal to 14 } //test if the subtract() method in our calculator class From 96c22ddb3c3e251aa66ed67227cbbe0ed21858ee Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Wed, 18 Mar 2015 15:30:20 +0530 Subject: [PATCH 72/85] 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 7448b16194b59ba4b0065af6d57846db0685282f Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Wed, 18 Mar 2015 15:38:05 +0530 Subject: [PATCH 73/85] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 22a4ca4..9d33020 100644 --- a/shippable.yml +++ b/shippable.yml @@ -29,7 +29,7 @@ script: notifications: email: - # - vidya@shippable.com + - vidya@shippable.com - vidyac.raghav@gmail.com archive: true From c3bf9baa576675da6b6e84caf2835ca2c1cc10d3 Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Thu, 19 Mar 2015 11:52:07 +0530 Subject: [PATCH 74/85] [skip ci] --- shippable.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 9d33020..13cef11 100644 --- a/shippable.yml +++ b/shippable.yml @@ -1,6 +1,5 @@ language: php - php: - 5.3 - 5.6 From 6a422a2d05c8d77e85124bda1dec60bf0cbc075b Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Thu, 23 Jul 2015 16:25:55 +0530 Subject: [PATCH 75/85] Update shippable.yml --- shippable.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shippable.yml b/shippable.yml index 13cef11..e5e21cf 100644 --- a/shippable.yml +++ b/shippable.yml @@ -21,6 +21,8 @@ before_script: - printenv - echo $test + + script: - phpunit --log-junit shippable/testresults/junit.xml --coverage-xml shippable/codecoverage tests/calculator_test.php - git rev-parse --abbrev-ref HEAD From d416233c9e71de81e714c4da72a1c401dcb5fefa Mon Sep 17 00:00:00 2001 From: buildsample Date: Wed, 29 Jul 2015 11:49:58 +0530 Subject: [PATCH 76/85] [reset_minion] --- shippable.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/shippable.yml b/shippable.yml index e5e21cf..10d5150 100644 --- a/shippable.yml +++ b/shippable.yml @@ -21,8 +21,6 @@ before_script: - printenv - echo $test - - script: - phpunit --log-junit shippable/testresults/junit.xml --coverage-xml shippable/codecoverage tests/calculator_test.php - git rev-parse --abbrev-ref HEAD @@ -35,7 +33,7 @@ notifications: archive: true -cache: true +#cache: true branches: except: From cdb5c1636e48ae35a8ab004da009d057cc33bdb3 Mon Sep 17 00:00:00 2001 From: buildsample Date: Wed, 12 Aug 2015 13:25:54 +0530 Subject: [PATCH 77/85] Update shippable.yml --- shippable.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/shippable.yml b/shippable.yml index 10d5150..83f0c14 100644 --- a/shippable.yml +++ b/shippable.yml @@ -8,7 +8,6 @@ php: archive: true - before_install: - source ~/.rvm/scripts/rvm && rvm use 1.9.3 @@ -33,8 +32,6 @@ notifications: archive: true -#cache: true - branches: except: - shippable From 60a2c533db2d846843b61d8f887f84048e52c7e0 Mon Sep 17 00:00:00 2001 From: buildsample Date: Mon, 24 Aug 2015 17:20:35 +0530 Subject: [PATCH 78/85] 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 fdcd534..73cbbf1 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(14, $sum); //check if 2+3+4+5 is equal to 14 + $this->assertEquals(15, $sum); //check if 2+3+4+5 is equal to 14 } //test if the subtract() method in our calculator class From 52ba4fb0558824b599ee5369c0964f1629e0766a Mon Sep 17 00:00:00 2001 From: buildsample Date: Mon, 24 Aug 2015 17:26:44 +0530 Subject: [PATCH 79/85] 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 083b30b6c0da52715df21d6aafbde5a5c542a185 Mon Sep 17 00:00:00 2001 From: buildsample Date: Wed, 26 Aug 2015 11:28:53 +0530 Subject: [PATCH 80/85] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index aca6234..1bed1d1 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Sample PHP =============== - +Test3 Test Test2 Build sample for standalone PHP build sample. From c7271bcba0d9d59c378760a30d428b56d073e04e Mon Sep 17 00:00:00 2001 From: Vidya Raghavan Date: Mon, 28 Sep 2015 19:06:44 +0530 Subject: [PATCH 81/85] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 83f0c14..c2ec19d 100644 --- a/shippable.yml +++ b/shippable.yml @@ -1,7 +1,7 @@ language: php php: - - 5.3 + #- 5.3 - 5.6 - 5.5 - 5.4 From 8bf6dc46b4d1347877d161b616e259a7744829a2 Mon Sep 17 00:00:00 2001 From: buildsample Date: Thu, 1 Oct 2015 17:40:08 +0530 Subject: [PATCH 82/85] Update shippable.yml --- shippable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/shippable.yml b/shippable.yml index c2ec19d..cf659e0 100644 --- a/shippable.yml +++ b/shippable.yml @@ -1,5 +1,6 @@ language: php + php: #- 5.3 - 5.6 From f4780e2c92d40777dcf5e004ef497e4120233edf Mon Sep 17 00:00:00 2001 From: buildsample Date: Mon, 5 Oct 2015 11:30:52 +0530 Subject: [PATCH 83/85] [skip ci] --- shippable.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index cf659e0..e75bf65 100644 --- a/shippable.yml +++ b/shippable.yml @@ -13,7 +13,9 @@ before_install: - source ~/.rvm/scripts/rvm && rvm use 1.9.3 env: - - secure: c8Mhtx5/8SqzIQNgXwkvFfeVrib7lbzF9EgZFfETm2bPBtdaM2EyoVT8WlOdp/Ga3+RpmQzL3DmnWx+fppS790QrGnW3bdI6X8zi0EGRXxqP4YjCpxXkcg31RMEOoYamEu55vav/00tXGcN6I1OoQU+6dH+SQ+5qqdQQ5gFyf9JRvcg13b3+7YmQLLswUZq8MRkk0ifNEKRQy5+Fc3bPn9ePoR8rw3f0WOO4q1G9IgEUdmeV1wxdKcjMKu0wgixDjGgy5lABr12uh99EnLvN90Hjucg26ouRvfkICe4SvCEbFduIEL9IppVYyLo9io/in1iD7AoPZCOaXNz7OYg6eg== + global: + # - Foo=bar + - secure: c8Mhtx5/8SqzIQNgXwkvFfeVrib7lbzF9EgZFfETm2bPBtdaM2EyoVT8WlOdp/Ga3+RpmQzL3DmnWx+fppS790QrGnW3bdI6X8zi0EGRXxqP4YjCpxXkcg31RMEOoYamEu55vav/00tXGcN6I1OoQU+6dH+SQ+5qqdQQ5gFyf9JRvcg13b3+7YmQLLswUZq8MRkk0ifNEKRQy5+Fc3bPn9ePoR8rw3f0WOO4q1G9IgEUdmeV1wxdKcjMKu0wgixDjGgy5lABr12uh99EnLvN90Hjucg26ouRvfkICe4SvCEbFduIEL9IppVYyLo9io/in1iD7AoPZCOaXNz7OYg6eg== before_script: - mkdir -p shippable/codecoverage @@ -24,6 +26,7 @@ before_script: script: - phpunit --log-junit shippable/testresults/junit.xml --coverage-xml shippable/codecoverage tests/calculator_test.php - git rev-parse --abbrev-ref HEAD + # - echo notifications: From 07e312c0684176d14f846b9164035b7fcbf6202c Mon Sep 17 00:00:00 2001 From: buildsample Date: Mon, 5 Oct 2015 11:32:39 +0530 Subject: [PATCH 84/85] Update shippable.yml --- shippable.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shippable.yml b/shippable.yml index e75bf65..2a2b4da 100644 --- a/shippable.yml +++ b/shippable.yml @@ -14,7 +14,7 @@ before_install: env: global: - # - Foo=bar + - Foo=bar - secure: c8Mhtx5/8SqzIQNgXwkvFfeVrib7lbzF9EgZFfETm2bPBtdaM2EyoVT8WlOdp/Ga3+RpmQzL3DmnWx+fppS790QrGnW3bdI6X8zi0EGRXxqP4YjCpxXkcg31RMEOoYamEu55vav/00tXGcN6I1OoQU+6dH+SQ+5qqdQQ5gFyf9JRvcg13b3+7YmQLLswUZq8MRkk0ifNEKRQy5+Fc3bPn9ePoR8rw3f0WOO4q1G9IgEUdmeV1wxdKcjMKu0wgixDjGgy5lABr12uh99EnLvN90Hjucg26ouRvfkICe4SvCEbFduIEL9IppVYyLo9io/in1iD7AoPZCOaXNz7OYg6eg== before_script: @@ -26,7 +26,7 @@ before_script: script: - phpunit --log-junit shippable/testresults/junit.xml --coverage-xml shippable/codecoverage tests/calculator_test.php - git rev-parse --abbrev-ref HEAD - # - echo + - echo $Foo notifications: From b7b84372d61322179cbcc0e536fbb8d4f9faa6e9 Mon Sep 17 00:00:00 2001 From: csharp Date: Mon, 26 Oct 2015 11:48:56 +0530 Subject: [PATCH 85/85] Update shippable.yml --- shippable.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/shippable.yml b/shippable.yml index 2a2b4da..e2eeead 100644 --- a/shippable.yml +++ b/shippable.yml @@ -30,10 +30,15 @@ script: notifications: - email: - - vidya@shippable.com - - vidyac.raghav@gmail.com - + email: + recipients: + - vidya@shippable.com + - buildsampletest@gmail.com + # - vidyac.raghav@gmail.com + on_success: always + on_failure: always + + archive: true branches: