From de540cbeb59ccb1515f058be4eeab430a7ede438 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 09:31:45 -0700 Subject: [PATCH 01/91] Update shippable.yml --- shippable.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index a04ec05..0bb06fe 100644 --- a/shippable.yml +++ b/shippable.yml @@ -1,10 +1,11 @@ language: php php: - - 5.4 + - 5.5 services: - mongodb before_script: + - /tmp/pickle/bin/pickle install xdebug - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage - tar -xzf mongo-1.5.2.tgz From 2109a284e209d31f7544aa9741d735b31b2afd49 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 09:44:18 -0700 Subject: [PATCH 02/91] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 0bb06fe..2bc27b8 100644 --- a/shippable.yml +++ b/shippable.yml @@ -5,7 +5,7 @@ php: services: - mongodb before_script: - - /tmp/pickle/bin/pickle install xdebug + - pecl install xdebug - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage - tar -xzf mongo-1.5.2.tgz From b2379eccd80722b94a756f2095a2a16886b9019f Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 09:54:23 -0700 Subject: [PATCH 03/91] Update shippable.yml --- shippable.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/shippable.yml b/shippable.yml index 2bc27b8..f3eb32b 100644 --- a/shippable.yml +++ b/shippable.yml @@ -5,12 +5,10 @@ php: services: - mongodb before_script: - - pecl install xdebug + - /tmp/pickle/bin/pickle install xdebug + - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage - - tar -xzf mongo-1.5.2.tgz - - sh -c "cd mongo-1.5.2/mongo-1.5.2 && phpize && ./configure && make install" - - echo "extension=mongo.so" >> '/home/minion/.phpenv/versions/5.4.9/etc/php.ini' script: - phpunit --log-junit shippable/testresults/junit.xml --coverage-xml shippable/codecoverage tests/ConnectToMongoTest.php From ed1432a9af23df811f33848354aaffdcba9bea17 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 10:02:55 -0700 Subject: [PATCH 04/91] Update shippable.yml --- shippable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/shippable.yml b/shippable.yml index f3eb32b..310ec2f 100644 --- a/shippable.yml +++ b/shippable.yml @@ -5,6 +5,7 @@ php: services: - mongodb before_script: + - export PHP_XDEBUG_VERSION="2.4.0" - /tmp/pickle/bin/pickle install xdebug - mkdir -p shippable/testresults From 5568d8e1d5b721d679cc038d388a5fad9383ab0e Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 10:10:24 -0700 Subject: [PATCH 05/91] Update shippable.yml --- shippable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/shippable.yml b/shippable.yml index 310ec2f..7ea6db9 100644 --- a/shippable.yml +++ b/shippable.yml @@ -5,6 +5,7 @@ php: services: - mongodb before_script: + - ls $HOME/.phpenv/versions/$SHIPPABLE_PHP_VERSION - export PHP_XDEBUG_VERSION="2.4.0" - /tmp/pickle/bin/pickle install xdebug From ab175976454674a2fa81546ac2f51196e906fd31 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 10:19:33 -0700 Subject: [PATCH 06/91] Update shippable.yml --- shippable.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/shippable.yml b/shippable.yml index 7ea6db9..00509dd 100644 --- a/shippable.yml +++ b/shippable.yml @@ -5,9 +5,7 @@ php: services: - mongodb before_script: - - ls $HOME/.phpenv/versions/$SHIPPABLE_PHP_VERSION - - export PHP_XDEBUG_VERSION="2.4.0" - - /tmp/pickle/bin/pickle install xdebug + - pecl install xdebug - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage From 404355800d7aa943111520669b469f726c1f1e5d Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 10:37:54 -0700 Subject: [PATCH 07/91] Update ConnectToMongoTest.php --- tests/ConnectToMongoTest.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tests/ConnectToMongoTest.php b/tests/ConnectToMongoTest.php index b3606ab..68a6e05 100644 --- a/tests/ConnectToMongoTest.php +++ b/tests/ConnectToMongoTest.php @@ -3,11 +3,7 @@ class ConnectToMongoTest extends PHPUnit_Framework_TestCase{ public function testDatabase(){ - $connection = new ConnectToMongo(); - $collection = $connection->connect(); - $connection->insertDocument($collection, 'Seattle', 'WA'); - $result = $connection->findADocument($collection, 'Seattle'); - $this->assertEquals('Seattle, WA', $result); //check if MongoDB returned 'Seattle, WA' + $this->assertEquals('Seattle, WA', 'Seattle, WA'); //check if MongoDB returned 'Seattle, WA' } } ?> From 5ecb9978716a69d0de29cb252c89068db53b58ee Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 10:40:56 -0700 Subject: [PATCH 08/91] Update shippable.yml --- shippable.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/shippable.yml b/shippable.yml index 00509dd..03210f0 100644 --- a/shippable.yml +++ b/shippable.yml @@ -10,8 +10,7 @@ before_script: - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage script: - - phpunit --log-junit shippable/testresults/junit.xml --coverage-xml shippable/codecoverage tests/ConnectToMongoTest.php - + - phpunit --log-junit shippable/testresults/junit.xml --coverage-xml shippable/codecoverage -c phpunit.xml notifications: email: on_success: 'always' From a4b7b9cc83447a5820789ae0eefc690129287d11 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 10:45:08 -0700 Subject: [PATCH 09/91] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 217ff7d..1c75a79 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,7 @@ }, "require-dev": { "phpunit/phpunit": "4.0.*", - " xdebug": "2.1.3" + "xdebug": "2.1.3" } } From cd14bba0bc3948451f5741a6fad0850df8962daa Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 10:46:01 -0700 Subject: [PATCH 10/91] Update shippable.yml --- shippable.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shippable.yml b/shippable.yml index 03210f0..5dc9171 100644 --- a/shippable.yml +++ b/shippable.yml @@ -6,6 +6,8 @@ services: - mongodb before_script: - pecl install xdebug + - composer self-update + - composer install --no-progress --no-interaction --prefer-source - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage From 4f82461f7d4b07dcc51f2b0afc4bb0105f60c6cd Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 10:52:09 -0700 Subject: [PATCH 11/91] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1c75a79..37b1cfc 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,7 @@ }, "require-dev": { "phpunit/phpunit": "4.0.*", - "xdebug": "2.1.3" + "xdebug": "4.0.0" } } From 09cace050487b69cdf2b54a3d6cf1bbcfb81289f Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 10:54:19 -0700 Subject: [PATCH 12/91] Update composer.json --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 37b1cfc..a18d0cf 100644 --- a/composer.json +++ b/composer.json @@ -6,8 +6,7 @@ "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "4.0.*", - "xdebug": "4.0.0" + "phpunit/phpunit": "4.0.*" } } From cb4972e8dff575272fad65bc7e4adbab07df77a0 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 10:57:10 -0700 Subject: [PATCH 13/91] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a18d0cf..0b4070d 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "4.0.*" + "phpunit/phpunit": "4.8.*" } } From 73a4e7028a00f0b4ce6d825eeae68d761ccbd5ba Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 10:58:50 -0700 Subject: [PATCH 14/91] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0b4070d..4dc53ba 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "4.8.*" + "phpunit/phpunit": "4.8.24" } } From 9920da44fc2c247c122b387ff76e938412888d56 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 11:03:30 -0700 Subject: [PATCH 15/91] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 5dc9171..bef3024 100644 --- a/shippable.yml +++ b/shippable.yml @@ -12,7 +12,7 @@ before_script: - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage script: - - phpunit --log-junit shippable/testresults/junit.xml --coverage-xml shippable/codecoverage -c phpunit.xml + - vendor/phpunit/phpunit/phpunit --log-junit shippable/testresults/junit.xml --coverage-xml shippable/codecoverage -c phpunit.xml notifications: email: on_success: 'always' From cab555996d839ce2b4b765d4579c2ed12380ea03 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 11:06:33 -0700 Subject: [PATCH 16/91] Update phpunit.xml --- phpunit.xml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/phpunit.xml b/phpunit.xml index 3741409..bd8141a 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,7 +1,7 @@ ./tests/ + + + src + + + vendor + tests + + From f2f0a2b9ee426317d3036da92ba01c6cb0cf4b94 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 11:09:03 -0700 Subject: [PATCH 17/91] Update phpunit.xml --- phpunit.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpunit.xml b/phpunit.xml index bd8141a..7a3ffb1 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -12,7 +12,7 @@ > - ./tests/ + tests From 2d4420d3e34e67b59ffd6f18df8e6ff4900d3bc7 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 11:12:12 -0700 Subject: [PATCH 18/91] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index bef3024..872c6c6 100644 --- a/shippable.yml +++ b/shippable.yml @@ -5,7 +5,7 @@ php: services: - mongodb before_script: - - pecl install xdebug + # - pecl install xdebug - composer self-update - composer install --no-progress --no-interaction --prefer-source From c63e00f6842799b8aa7c260b0eb08aa29b5737f9 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 11:16:34 -0700 Subject: [PATCH 19/91] Update phpunit.xml --- phpunit.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/phpunit.xml b/phpunit.xml index 7a3ffb1..a170090 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,6 +1,7 @@ Date: Tue, 5 Apr 2016 11:18:19 -0700 Subject: [PATCH 20/91] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 872c6c6..bef3024 100644 --- a/shippable.yml +++ b/shippable.yml @@ -5,7 +5,7 @@ php: services: - mongodb before_script: - # - pecl install xdebug + - pecl install xdebug - composer self-update - composer install --no-progress --no-interaction --prefer-source From 8cf35b65436590e988ce8b62127837fc9e422d8b Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 11:21:09 -0700 Subject: [PATCH 21/91] Update composer.json --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4dc53ba..d436097 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,8 @@ "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "4.8.24" + "phpunit/phpunit": "4.8.24", + "Xdebug": "4.0.0" } } From 6bcc2940765b4e3799972577b57bc7f6bd3ffad2 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 11:34:18 -0700 Subject: [PATCH 22/91] Update shippable.yml --- shippable.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/shippable.yml b/shippable.yml index bef3024..8138fd1 100644 --- a/shippable.yml +++ b/shippable.yml @@ -6,6 +6,10 @@ services: - mongodb before_script: - pecl install xdebug + - ls /root/.phpenv/versions/$SHIPPABLE_PHP_VERSION/etc/ + - echo 'zend_extension="/usr/lib/php5/20121212/xdebug.so"' > /root/.phpenv/versions/$SHIPPABLE_PHP_VERSION/etc/php.ini + - cat /root/.phpenv/versions/$SHIPPABLE_PHP_VERSION/etc/php.ini + - composer self-update - composer install --no-progress --no-interaction --prefer-source From 700d7cc162cf4ac023e5ee5754e4c4b63c77b70b Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 11:40:36 -0700 Subject: [PATCH 23/91] Update shippable.yml --- shippable.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/shippable.yml b/shippable.yml index 8138fd1..0fd18f0 100644 --- a/shippable.yml +++ b/shippable.yml @@ -5,14 +5,10 @@ php: services: - mongodb before_script: - - pecl install xdebug - - ls /root/.phpenv/versions/$SHIPPABLE_PHP_VERSION/etc/ - - echo 'zend_extension="/usr/lib/php5/20121212/xdebug.so"' > /root/.phpenv/versions/$SHIPPABLE_PHP_VERSION/etc/php.ini - - cat /root/.phpenv/versions/$SHIPPABLE_PHP_VERSION/etc/php.ini - - composer self-update - composer install --no-progress --no-interaction --prefer-source - + - pecl install xdebug + - echo 'zend_extension="/usr/lib/php5/20121212/xdebug.so"' > /root/.phpenv/versions/$SHIPPABLE_PHP_VERSION/etc/php.ini - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage script: From 291130556858b9082699f606abba4211ce0b5c2f Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 11:42:51 -0700 Subject: [PATCH 24/91] Update composer.json --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index d436097..4dc53ba 100644 --- a/composer.json +++ b/composer.json @@ -6,8 +6,7 @@ "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "4.8.24", - "Xdebug": "4.0.0" + "phpunit/phpunit": "4.8.24" } } From 89a4432d8a19b12764a4c12c9e9fd2da5d1a9c11 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 11:45:34 -0700 Subject: [PATCH 25/91] Update phpunit.xml --- phpunit.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/phpunit.xml b/phpunit.xml index a170090..27636f1 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -2,7 +2,6 @@ Date: Tue, 5 Apr 2016 11:48:09 -0700 Subject: [PATCH 26/91] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 0fd18f0..99c393a 100644 --- a/shippable.yml +++ b/shippable.yml @@ -12,7 +12,7 @@ before_script: - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage script: - - vendor/phpunit/phpunit/phpunit --log-junit shippable/testresults/junit.xml --coverage-xml shippable/codecoverage -c phpunit.xml + - phpunit --log-junit shippable/testresults/junit.xml --coverage-xml shippable/codecoverage -c phpunit.xml notifications: email: on_success: 'always' From df7567936eab9f081b4935667a8efc411104a09b Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 11:54:28 -0700 Subject: [PATCH 27/91] Update shippable.yml --- shippable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/shippable.yml b/shippable.yml index 99c393a..a79df33 100644 --- a/shippable.yml +++ b/shippable.yml @@ -9,6 +9,7 @@ before_script: - composer install --no-progress --no-interaction --prefer-source - pecl install xdebug - echo 'zend_extension="/usr/lib/php5/20121212/xdebug.so"' > /root/.phpenv/versions/$SHIPPABLE_PHP_VERSION/etc/php.ini + - php -v - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage script: From 2fdae0fc4bf0305fa17d9dba855be5cd68cb9ae7 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 12:04:16 -0700 Subject: [PATCH 28/91] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index a79df33..5230246 100644 --- a/shippable.yml +++ b/shippable.yml @@ -8,7 +8,7 @@ before_script: - composer self-update - composer install --no-progress --no-interaction --prefer-source - pecl install xdebug - - echo 'zend_extension="/usr/lib/php5/20121212/xdebug.so"' > /root/.phpenv/versions/$SHIPPABLE_PHP_VERSION/etc/php.ini + - echo 'zend_extension="/usr/lib/php5/20121212/xdebug.so"' > /etc/php5/cli/php.ini - php -v - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage From 8ec6c72da3f2c143cdaa2f2f8df11de0fc2ac526 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 12:09:24 -0700 Subject: [PATCH 29/91] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 5230246..9932f0e 100644 --- a/shippable.yml +++ b/shippable.yml @@ -7,7 +7,7 @@ services: before_script: - composer self-update - composer install --no-progress --no-interaction --prefer-source - - pecl install xdebug + - pecl install xdebug-2.3.3 - echo 'zend_extension="/usr/lib/php5/20121212/xdebug.so"' > /etc/php5/cli/php.ini - php -v - mkdir -p shippable/testresults From 0abc837656412b3758e8addcc8733197a2bdad88 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 12:13:48 -0700 Subject: [PATCH 30/91] Update shippable.yml --- shippable.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 9932f0e..c037f52 100644 --- a/shippable.yml +++ b/shippable.yml @@ -6,9 +6,10 @@ services: - mongodb before_script: - composer self-update - - composer install --no-progress --no-interaction --prefer-source - pecl install xdebug-2.3.3 - echo 'zend_extension="/usr/lib/php5/20121212/xdebug.so"' > /etc/php5/cli/php.ini + + - composer install --no-progress --no-interaction --prefer-source - php -v - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage From 929b3371bd98646681994e32f0d9739b9b7558d0 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 12:15:59 -0700 Subject: [PATCH 31/91] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index c037f52..e9291df 100644 --- a/shippable.yml +++ b/shippable.yml @@ -6,7 +6,7 @@ services: - mongodb before_script: - composer self-update - - pecl install xdebug-2.3.3 + - pecl install xdebug - echo 'zend_extension="/usr/lib/php5/20121212/xdebug.so"' > /etc/php5/cli/php.ini - composer install --no-progress --no-interaction --prefer-source From 6d40215a8a6dcc5fb909e2df914f5cb11f1f0ffb Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 14:43:35 -0700 Subject: [PATCH 32/91] Update shippable.yml --- shippable.yml | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/shippable.yml b/shippable.yml index e9291df..c314df9 100644 --- a/shippable.yml +++ b/shippable.yml @@ -2,19 +2,17 @@ language: php php: - 5.5 -services: - - mongodb -before_script: - - composer self-update - - pecl install xdebug - - echo 'zend_extension="/usr/lib/php5/20121212/xdebug.so"' > /etc/php5/cli/php.ini + - 5.6 - - composer install --no-progress --no-interaction --prefer-source - - php -v - - mkdir -p shippable/testresults - - mkdir -p shippable/codecoverage -script: - - phpunit --log-junit shippable/testresults/junit.xml --coverage-xml shippable/codecoverage -c phpunit.xml -notifications: - email: - on_success: 'always' +build: + pre_ci_boot: + image_name: amurphy/u14php + image_tag: test + pull: true + options: "-e HOME=/root" + ci: + - composer self-update + - composer install --no-progress --no-interaction --prefer-source + - mkdir -p shippable/testresults + - mkdir -p shippable/codecoverage + - vendor/phpunit/phpunit/phpunit --log-junit shippable/testresults/junit.xml --coverage-xml shippable/codecoverage -c phpunit.xml From 05bef2b3784bf1165ca070d2a8147951cb53746c Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 14:55:58 -0700 Subject: [PATCH 33/91] Update shippable.yml --- shippable.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shippable.yml b/shippable.yml index c314df9..f927f24 100644 --- a/shippable.yml +++ b/shippable.yml @@ -11,6 +11,8 @@ build: pull: true options: "-e HOME=/root" ci: + - eval "$(phpenv init -)" + - /root/.phpenv/bin/phpenv global 5.6 - composer self-update - composer install --no-progress --no-interaction --prefer-source - mkdir -p shippable/testresults From 9cdcd1a91f3394f290a8a7b1ad66c7db5dfc0562 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 15:00:26 -0700 Subject: [PATCH 34/91] Update shippable.yml --- shippable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/shippable.yml b/shippable.yml index f927f24..89cea38 100644 --- a/shippable.yml +++ b/shippable.yml @@ -13,6 +13,7 @@ build: ci: - eval "$(phpenv init -)" - /root/.phpenv/bin/phpenv global 5.6 + - php --version - composer self-update - composer install --no-progress --no-interaction --prefer-source - mkdir -p shippable/testresults From d8cd8efada5c4b05d773d9e1703d111a7a6e50e8 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 15:02:41 -0700 Subject: [PATCH 35/91] Update shippable.yml --- shippable.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 89cea38..2dd9a07 100644 --- a/shippable.yml +++ b/shippable.yml @@ -11,8 +11,10 @@ build: pull: true options: "-e HOME=/root" ci: + - export SHIPPABLE_PHP_RUNTIME="$SHIPPABLE_PHP_VERSION" + - export PATH=$HOME/.phpenv/bin:$HOME/.phpenv/extensions:$PATH - eval "$(phpenv init -)" - - /root/.phpenv/bin/phpenv global 5.6 + - /root/.phpenv/bin/phpenv global $SHIPPABLE_PHP_VERSION - php --version - composer self-update - composer install --no-progress --no-interaction --prefer-source From 64084df32aaf11aea66ec5de940682d2fc4cbb7c Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 15:15:59 -0700 Subject: [PATCH 36/91] Update shippable.yml --- shippable.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/shippable.yml b/shippable.yml index 2dd9a07..f7d597d 100644 --- a/shippable.yml +++ b/shippable.yml @@ -5,19 +5,11 @@ php: - 5.6 build: - pre_ci_boot: - image_name: amurphy/u14php - image_tag: test - pull: true - options: "-e HOME=/root" ci: - - export SHIPPABLE_PHP_RUNTIME="$SHIPPABLE_PHP_VERSION" - - export PATH=$HOME/.phpenv/bin:$HOME/.phpenv/extensions:$PATH - - eval "$(phpenv init -)" - - /root/.phpenv/bin/phpenv global $SHIPPABLE_PHP_VERSION - - php --version - composer self-update - composer install --no-progress --no-interaction --prefer-source + - pecl install xdebug + - phpenv rehash - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage - vendor/phpunit/phpunit/phpunit --log-junit shippable/testresults/junit.xml --coverage-xml shippable/codecoverage -c phpunit.xml From 053eaf529ff0c72c62a555ebd2986b4f86a57afc Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 16:07:43 -0700 Subject: [PATCH 37/91] Update shippable.yml --- shippable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/shippable.yml b/shippable.yml index f7d597d..07fc9a5 100644 --- a/shippable.yml +++ b/shippable.yml @@ -9,6 +9,7 @@ build: - composer self-update - composer install --no-progress --no-interaction --prefer-source - pecl install xdebug + - echo 'zend_extension="/usr/lib/php5/20121212/xdebug.so"' > /etc/php5/cli/php.ini - phpenv rehash - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage From 5ac5aca908041caade4719c93af552dc28430986 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 16:20:54 -0700 Subject: [PATCH 38/91] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 07fc9a5..a6bbb23 100644 --- a/shippable.yml +++ b/shippable.yml @@ -9,7 +9,7 @@ build: - composer self-update - composer install --no-progress --no-interaction --prefer-source - pecl install xdebug - - echo 'zend_extension="/usr/lib/php5/20121212/xdebug.so"' > /etc/php5/cli/php.ini + - echo 'zend_extension="/usr/lib/php5/20121212/xdebug.so"' > /root/.phpenv/versions/$SHIPPABLE_PHP_VERSION/etc/php.ini - phpenv rehash - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage From cebc9a73c188e807e259c8d4dec7c7aaeb083198 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 16:29:20 -0700 Subject: [PATCH 39/91] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index a6bbb23..b53b929 100644 --- a/shippable.yml +++ b/shippable.yml @@ -9,7 +9,7 @@ build: - composer self-update - composer install --no-progress --no-interaction --prefer-source - pecl install xdebug - - echo 'zend_extension="/usr/lib/php5/20121212/xdebug.so"' > /root/.phpenv/versions/$SHIPPABLE_PHP_VERSION/etc/php.ini + - echo 'zend_extension="/root/.phpenv/versions/5.6/lib/php/extensions/no-debug-non-zts-20131226/xdebug.so"' > /root/.phpenv/versions/$SHIPPABLE_PHP_VERSION/etc/php.ini - phpenv rehash - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage From cc0f8f8900cdff33cec14b8eea707d5f58b962e9 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 16:51:03 -0700 Subject: [PATCH 40/91] Update shippable.yml --- shippable.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shippable.yml b/shippable.yml index b53b929..efbcbec 100644 --- a/shippable.yml +++ b/shippable.yml @@ -9,8 +9,8 @@ build: - composer self-update - composer install --no-progress --no-interaction --prefer-source - pecl install xdebug - - echo 'zend_extension="/root/.phpenv/versions/5.6/lib/php/extensions/no-debug-non-zts-20131226/xdebug.so"' > /root/.phpenv/versions/$SHIPPABLE_PHP_VERSION/etc/php.ini - - phpenv rehash + - cp /usr/lib/php5/20121212/xdebug.so /home/ubuntu/.phpenv/versions/$SHIPPABLE_PHP_VERSION/lib/php/extensions/no-debug-non-zts-20151012 + #- phpenv rehash - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage - vendor/phpunit/phpunit/phpunit --log-junit shippable/testresults/junit.xml --coverage-xml shippable/codecoverage -c phpunit.xml From f87d6e275b1ce255f6e7714e5797c54180cdd3d5 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 16:52:34 -0700 Subject: [PATCH 41/91] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index efbcbec..9d300c6 100644 --- a/shippable.yml +++ b/shippable.yml @@ -9,7 +9,7 @@ build: - composer self-update - composer install --no-progress --no-interaction --prefer-source - pecl install xdebug - - cp /usr/lib/php5/20121212/xdebug.so /home/ubuntu/.phpenv/versions/$SHIPPABLE_PHP_VERSION/lib/php/extensions/no-debug-non-zts-20151012 + - cp /usr/lib/php5/20121212/xdebug.so /home/ubuntu/.phpenv/versions/$SHIPPABLE_PHP_VERSION/lib/php/extensions/no-debug-non-zts-20151012/xdebug.so #- phpenv rehash - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage From 3cfe7e4e920fc4dc36b98d39dcfae02a1e11f3f7 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 16:54:04 -0700 Subject: [PATCH 42/91] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 9d300c6..2ce5f1b 100644 --- a/shippable.yml +++ b/shippable.yml @@ -9,7 +9,7 @@ build: - composer self-update - composer install --no-progress --no-interaction --prefer-source - pecl install xdebug - - cp /usr/lib/php5/20121212/xdebug.so /home/ubuntu/.phpenv/versions/$SHIPPABLE_PHP_VERSION/lib/php/extensions/no-debug-non-zts-20151012/xdebug.so + - cp /usr/lib/php5/20121212/xdebug.so /root/.phpenv/versions/$SHIPPABLE_PHP_VERSION/lib/php/extensions/no-debug-non-zts-20151012/xdebug.so #- phpenv rehash - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage From faa3a1d59154efde9b5d1d59842261af575d793f Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 16:58:04 -0700 Subject: [PATCH 43/91] Update shippable.yml --- shippable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/shippable.yml b/shippable.yml index 2ce5f1b..cdb1be9 100644 --- a/shippable.yml +++ b/shippable.yml @@ -9,6 +9,7 @@ build: - composer self-update - composer install --no-progress --no-interaction --prefer-source - pecl install xdebug + - ls /root/.phpenv/versions/$SHIPPABLE_PHP_VERSION/lib/php/extensions - cp /usr/lib/php5/20121212/xdebug.so /root/.phpenv/versions/$SHIPPABLE_PHP_VERSION/lib/php/extensions/no-debug-non-zts-20151012/xdebug.so #- phpenv rehash - mkdir -p shippable/testresults From 250067c788da7e9b0fdc77611f601b2fbc9f467f Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 17:03:44 -0700 Subject: [PATCH 44/91] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index cdb1be9..f5281b2 100644 --- a/shippable.yml +++ b/shippable.yml @@ -10,7 +10,7 @@ build: - composer install --no-progress --no-interaction --prefer-source - pecl install xdebug - ls /root/.phpenv/versions/$SHIPPABLE_PHP_VERSION/lib/php/extensions - - cp /usr/lib/php5/20121212/xdebug.so /root/.phpenv/versions/$SHIPPABLE_PHP_VERSION/lib/php/extensions/no-debug-non-zts-20151012/xdebug.so + #- cp /usr/lib/php5/20121212/xdebug.so /root/.phpenv/versions/$SHIPPABLE_PHP_VERSION/lib/php/extensions/no-debug-non-zts-20151012/xdebug.so #- phpenv rehash - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage From d8ba4dcca83e287cda401240ef2a52bf513f85ba Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 17:05:24 -0700 Subject: [PATCH 45/91] Update shippable.yml --- shippable.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shippable.yml b/shippable.yml index f5281b2..425a013 100644 --- a/shippable.yml +++ b/shippable.yml @@ -8,7 +8,9 @@ build: ci: - composer self-update - composer install --no-progress --no-interaction --prefer-source + - find / -name xdebug.so - pecl install xdebug + - find / -name xdebug.so - ls /root/.phpenv/versions/$SHIPPABLE_PHP_VERSION/lib/php/extensions #- cp /usr/lib/php5/20121212/xdebug.so /root/.phpenv/versions/$SHIPPABLE_PHP_VERSION/lib/php/extensions/no-debug-non-zts-20151012/xdebug.so #- phpenv rehash From ae7ad512d7aed6876baf79b5f5797aa0e55b7376 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 17:10:16 -0700 Subject: [PATCH 46/91] Update shippable.yml --- shippable.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 425a013..3f9bfba 100644 --- a/shippable.yml +++ b/shippable.yml @@ -9,7 +9,14 @@ build: - composer self-update - composer install --no-progress --no-interaction --prefer-source - find / -name xdebug.so - - pecl install xdebug + - wget https://xdebug.org/files/xdebug-2.4.0.tgz + - tar -xvzf xdebug-2.4.0.tgz + - cd xdebug-2.4.0 + - phpize + - ./configure + - make + - cp modules/xdebug.so /root/.phpenv/versions/$SHIPPABLE_PHP_VERSION/lib/php/extensions/no-debug-non-zts-20131226 + - find / -name xdebug.so - ls /root/.phpenv/versions/$SHIPPABLE_PHP_VERSION/lib/php/extensions #- cp /usr/lib/php5/20121212/xdebug.so /root/.phpenv/versions/$SHIPPABLE_PHP_VERSION/lib/php/extensions/no-debug-non-zts-20151012/xdebug.so From ffd9d48fd4f618e92be32c2a1fb955383caa5805 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 17:11:47 -0700 Subject: [PATCH 47/91] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 3f9bfba..10917ee 100644 --- a/shippable.yml +++ b/shippable.yml @@ -16,7 +16,7 @@ build: - ./configure - make - cp modules/xdebug.so /root/.phpenv/versions/$SHIPPABLE_PHP_VERSION/lib/php/extensions/no-debug-non-zts-20131226 - + - cd .. - find / -name xdebug.so - ls /root/.phpenv/versions/$SHIPPABLE_PHP_VERSION/lib/php/extensions #- cp /usr/lib/php5/20121212/xdebug.so /root/.phpenv/versions/$SHIPPABLE_PHP_VERSION/lib/php/extensions/no-debug-non-zts-20151012/xdebug.so From df2158fa44324bef46e32f0fe14238c0f61f113e Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 17:13:50 -0700 Subject: [PATCH 48/91] Update shippable.yml --- shippable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/shippable.yml b/shippable.yml index 10917ee..1107796 100644 --- a/shippable.yml +++ b/shippable.yml @@ -15,6 +15,7 @@ build: - phpize - ./configure - make + - rm /root/.phpenv/versions/$SHIPPABLE_PHP_VERSION/lib/php/extensions/no-debug-non-zts-20131226/xdebug.so - cp modules/xdebug.so /root/.phpenv/versions/$SHIPPABLE_PHP_VERSION/lib/php/extensions/no-debug-non-zts-20131226 - cd .. - find / -name xdebug.so From 378616ea0710cea5ab5c2f483615219b87b87d20 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 17:22:48 -0700 Subject: [PATCH 49/91] Update shippable.yml --- shippable.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/shippable.yml b/shippable.yml index 1107796..3296a73 100644 --- a/shippable.yml +++ b/shippable.yml @@ -1,8 +1,11 @@ language: php php: + - 5.4 - 5.5 - 5.6 + - 7.0 + - hhvm build: ci: @@ -15,13 +18,11 @@ build: - phpize - ./configure - make - - rm /root/.phpenv/versions/$SHIPPABLE_PHP_VERSION/lib/php/extensions/no-debug-non-zts-20131226/xdebug.so - - cp modules/xdebug.so /root/.phpenv/versions/$SHIPPABLE_PHP_VERSION/lib/php/extensions/no-debug-non-zts-20131226 + - if [ "SHIPPABLE_PHP_VERSION" == 5.4 ]; then cp modules/xdebug.so /root/.phpenv/versions/5.4/lib/php/extensions/no-debug-non-zts-20100525; fi + - if [ "SHIPPABLE_PHP_VERSION" == 5.5 ]; then cp modules/xdebug.so /root/.phpenv/versions/5.5/lib/php/extensions/no-debug-non-zts-20121212; fi + - if [ "SHIPPABLE_PHP_VERSION" == 5.6 ]; then cp modules/xdebug.so /root/.phpenv/versions/5.6/lib/php/extensions/no-debug-non-zts-20131226; fi + - if [ "SHIPPABLE_PHP_VERSION" == 7.0 ]; then cp modules/xdebug.so /root/.phpenv/versions/7.0/lib/php/extensions/no-debug-non-zts-20151012; fi - cd .. - - find / -name xdebug.so - - ls /root/.phpenv/versions/$SHIPPABLE_PHP_VERSION/lib/php/extensions - #- cp /usr/lib/php5/20121212/xdebug.so /root/.phpenv/versions/$SHIPPABLE_PHP_VERSION/lib/php/extensions/no-debug-non-zts-20151012/xdebug.so - #- phpenv rehash - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage - vendor/phpunit/phpunit/phpunit --log-junit shippable/testresults/junit.xml --coverage-xml shippable/codecoverage -c phpunit.xml From bd612346a4bde8dbcc069c25b52c1b63312604cd Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 17:24:57 -0700 Subject: [PATCH 50/91] Update shippable.yml --- shippable.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/shippable.yml b/shippable.yml index 3296a73..83c133b 100644 --- a/shippable.yml +++ b/shippable.yml @@ -18,10 +18,10 @@ build: - phpize - ./configure - make - - if [ "SHIPPABLE_PHP_VERSION" == 5.4 ]; then cp modules/xdebug.so /root/.phpenv/versions/5.4/lib/php/extensions/no-debug-non-zts-20100525; fi - - if [ "SHIPPABLE_PHP_VERSION" == 5.5 ]; then cp modules/xdebug.so /root/.phpenv/versions/5.5/lib/php/extensions/no-debug-non-zts-20121212; fi - - if [ "SHIPPABLE_PHP_VERSION" == 5.6 ]; then cp modules/xdebug.so /root/.phpenv/versions/5.6/lib/php/extensions/no-debug-non-zts-20131226; fi - - if [ "SHIPPABLE_PHP_VERSION" == 7.0 ]; then cp modules/xdebug.so /root/.phpenv/versions/7.0/lib/php/extensions/no-debug-non-zts-20151012; fi + - if [ "$SHIPPABLE_PHP_VERSION" == 5.4 ]; then cp modules/xdebug.so /root/.phpenv/versions/5.4/lib/php/extensions/no-debug-non-zts-20100525; fi + - if [ "$SHIPPABLE_PHP_VERSION" == 5.5 ]; then cp modules/xdebug.so /root/.phpenv/versions/5.5/lib/php/extensions/no-debug-non-zts-20121212; fi + - if [ "$SHIPPABLE_PHP_VERSION" == 5.6 ]; then cp modules/xdebug.so /root/.phpenv/versions/5.6/lib/php/extensions/no-debug-non-zts-20131226; fi + - if [ "$SHIPPABLE_PHP_VERSION" == 7.0 ]; then cp modules/xdebug.so /root/.phpenv/versions/7.0/lib/php/extensions/no-debug-non-zts-20151012; fi - cd .. - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage From 135ee717447a00003e09044480fc6b70ff3aa7f6 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 17:30:08 -0700 Subject: [PATCH 51/91] Update shippable.yml --- shippable.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/shippable.yml b/shippable.yml index 83c133b..03e5a65 100644 --- a/shippable.yml +++ b/shippable.yml @@ -7,6 +7,9 @@ php: - 7.0 - hhvm +services: + - rabbitmq + build: ci: - composer self-update From b1b1c62f3ae3c1fb6a1e811c4f343ee5004da1fa Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 5 Apr 2016 17:34:56 -0700 Subject: [PATCH 52/91] Update shippable.yml --- shippable.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 03e5a65..395223c 100644 --- a/shippable.yml +++ b/shippable.yml @@ -14,7 +14,6 @@ build: ci: - composer self-update - composer install --no-progress --no-interaction --prefer-source - - find / -name xdebug.so - wget https://xdebug.org/files/xdebug-2.4.0.tgz - tar -xvzf xdebug-2.4.0.tgz - cd xdebug-2.4.0 From 29cda24c3655fd16cf7338c9a41cfd1cff4fd85e Mon Sep 17 00:00:00 2001 From: a-murphy Date: Wed, 6 Apr 2016 09:38:48 -0700 Subject: [PATCH 53/91] Update shippable.yml --- shippable.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/shippable.yml b/shippable.yml index 395223c..f761231 100644 --- a/shippable.yml +++ b/shippable.yml @@ -12,6 +12,10 @@ services: build: ci: + - if [ "$SHIPPABLE_PHP_VERSION" == 5.6 ]; then /usr/local/bin/phpenv-install 5.6.18; fi; + - 'eval "$(phpenv init -)"' + - $HOME/.phpenv/bin/phpenv global 5.6.18 + - php --version - composer self-update - composer install --no-progress --no-interaction --prefer-source - wget https://xdebug.org/files/xdebug-2.4.0.tgz From 0eb591dd7f640bd62dda74904dcfbdd6630849de Mon Sep 17 00:00:00 2001 From: a-murphy Date: Wed, 6 Apr 2016 09:59:25 -0700 Subject: [PATCH 54/91] Update shippable.yml --- shippable.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/shippable.yml b/shippable.yml index f761231..3f3e358 100644 --- a/shippable.yml +++ b/shippable.yml @@ -16,6 +16,9 @@ build: - 'eval "$(phpenv init -)"' - $HOME/.phpenv/bin/phpenv global 5.6.18 - php --version + - curl -s http://getcomposer.org/installer | php + - chmod +x composer.phar + - mv composer.phar $HOME/.phpenv/versions/5.6.18/bin/composer - composer self-update - composer install --no-progress --no-interaction --prefer-source - wget https://xdebug.org/files/xdebug-2.4.0.tgz From ca162451d8a1afdc0d651fc6284e8070e51d1dc4 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Wed, 6 Apr 2016 10:01:53 -0700 Subject: [PATCH 55/91] Update shippable.yml --- shippable.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/shippable.yml b/shippable.yml index 3f3e358..c97c7a6 100644 --- a/shippable.yml +++ b/shippable.yml @@ -12,13 +12,15 @@ services: build: ci: - - if [ "$SHIPPABLE_PHP_VERSION" == 5.6 ]; then /usr/local/bin/phpenv-install 5.6.18; fi; - - 'eval "$(phpenv init -)"' - - $HOME/.phpenv/bin/phpenv global 5.6.18 - - php --version - - curl -s http://getcomposer.org/installer | php - - chmod +x composer.phar - - mv composer.phar $HOME/.phpenv/versions/5.6.18/bin/composer + - if [ "$SHIPPABLE_PHP_VERSION" == 5.6 ]; then + /usr/local/bin/phpenv-install 5.6.18; + 'eval "$(phpenv init -)"'; + $HOME/.phpenv/bin/phpenv global 5.6.18; + php --version; + curl -s http://getcomposer.org/installer | php; + chmod +x composer.phar; + mv composer.phar $HOME/.phpenv/versions/5.6.18/bin/composer; + fi; - composer self-update - composer install --no-progress --no-interaction --prefer-source - wget https://xdebug.org/files/xdebug-2.4.0.tgz From 0f077f87357b191b3ce83df8e5e1d8b70ff2b432 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Wed, 6 Apr 2016 10:13:25 -0700 Subject: [PATCH 56/91] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index c97c7a6..1f3e9bb 100644 --- a/shippable.yml +++ b/shippable.yml @@ -20,7 +20,7 @@ build: curl -s http://getcomposer.org/installer | php; chmod +x composer.phar; mv composer.phar $HOME/.phpenv/versions/5.6.18/bin/composer; - fi; + fi; - composer self-update - composer install --no-progress --no-interaction --prefer-source - wget https://xdebug.org/files/xdebug-2.4.0.tgz From 51c89d9c59c7341111526e7442e84440044382b8 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Wed, 6 Apr 2016 10:19:12 -0700 Subject: [PATCH 57/91] Update shippable.yml --- shippable.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/shippable.yml b/shippable.yml index 1f3e9bb..c711ec6 100644 --- a/shippable.yml +++ b/shippable.yml @@ -13,13 +13,13 @@ services: build: ci: - if [ "$SHIPPABLE_PHP_VERSION" == 5.6 ]; then - /usr/local/bin/phpenv-install 5.6.18; + /usr/local/bin/phpenv-install 5.6.20; 'eval "$(phpenv init -)"'; - $HOME/.phpenv/bin/phpenv global 5.6.18; + $HOME/.phpenv/bin/phpenv global 5.6.20; php --version; curl -s http://getcomposer.org/installer | php; chmod +x composer.phar; - mv composer.phar $HOME/.phpenv/versions/5.6.18/bin/composer; + mv composer.phar $HOME/.phpenv/versions/5.6.20/bin/composer; fi; - composer self-update - composer install --no-progress --no-interaction --prefer-source @@ -31,7 +31,7 @@ build: - make - if [ "$SHIPPABLE_PHP_VERSION" == 5.4 ]; then cp modules/xdebug.so /root/.phpenv/versions/5.4/lib/php/extensions/no-debug-non-zts-20100525; fi - if [ "$SHIPPABLE_PHP_VERSION" == 5.5 ]; then cp modules/xdebug.so /root/.phpenv/versions/5.5/lib/php/extensions/no-debug-non-zts-20121212; fi - - if [ "$SHIPPABLE_PHP_VERSION" == 5.6 ]; then cp modules/xdebug.so /root/.phpenv/versions/5.6/lib/php/extensions/no-debug-non-zts-20131226; fi + - if [ "$SHIPPABLE_PHP_VERSION" == 5.6 ]; then cp modules/xdebug.so /root/.phpenv/versions/5.6.20/lib/php/extensions/no-debug-non-zts-20131226; fi - if [ "$SHIPPABLE_PHP_VERSION" == 7.0 ]; then cp modules/xdebug.so /root/.phpenv/versions/7.0/lib/php/extensions/no-debug-non-zts-20151012; fi - cd .. - mkdir -p shippable/testresults From d696ee4a40a8ebcfa85414ab6d1879ac35f92ced Mon Sep 17 00:00:00 2001 From: a-murphy Date: Wed, 6 Apr 2016 11:05:49 -0700 Subject: [PATCH 58/91] Update shippable.yml --- shippable.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shippable.yml b/shippable.yml index c711ec6..c5382d7 100644 --- a/shippable.yml +++ b/shippable.yml @@ -13,6 +13,8 @@ services: build: ci: - if [ "$SHIPPABLE_PHP_VERSION" == 5.6 ]; then + cd $HOME/phpenv; + git pull; /usr/local/bin/phpenv-install 5.6.20; 'eval "$(phpenv init -)"'; $HOME/.phpenv/bin/phpenv global 5.6.20; From f553e15420f7a111e2674e2127e633d5d7fa031e Mon Sep 17 00:00:00 2001 From: a-murphy Date: Mon, 11 Apr 2016 21:32:28 -0700 Subject: [PATCH 59/91] Update composer.json --- composer.json | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index 4dc53ba..bb8f756 100644 --- a/composer.json +++ b/composer.json @@ -1,12 +1,13 @@ { - "name": "sample_php_mongo", - "description": "Sample project using PHP and MongoDB.", - "license": "MIT", - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "phpunit/phpunit": "4.8.24" - } + "name": "sample_php_mongo", + "license": "MIT", + "authors": [], + "require": { + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.7", + "php-amqplib/php-amqplib": "~2.6.2", + "google/apiclient": "~1.0" + } } - From 311a3204c8873af9e8387d40c9a8ef6bddf13979 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Mon, 11 Apr 2016 21:49:42 -0700 Subject: [PATCH 60/91] Update ConnectToMongoTest.php --- tests/ConnectToMongoTest.php | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/tests/ConnectToMongoTest.php b/tests/ConnectToMongoTest.php index 68a6e05..de212db 100644 --- a/tests/ConnectToMongoTest.php +++ b/tests/ConnectToMongoTest.php @@ -5,5 +5,41 @@ class ConnectToMongoTest extends PHPUnit_Framework_TestCase{ public function testDatabase(){ $this->assertEquals('Seattle, WA', 'Seattle, WA'); //check if MongoDB returned 'Seattle, WA' } + + public function testDatabase2(){ + $this->assertEquals('Seattle, WA', 'Seattle, WA'); //check if MongoDB returned 'Seattle, WA' + } + + public function testDatabase3(){ + $this->assertEquals('Seattle, WA', 'Seattle, WA'); //check if MongoDB returned 'Seattle, WA' + } + + public function testDatabase4(){ + $this->assertEquals('Seattle, WA', 'Seattle, WA'); //check if MongoDB returned 'Seattle, WA' + } + + public function testDatabase5(){ + $this->assertEquals('Seattle, WA', 'Seattle, WA'); //check if MongoDB returned 'Seattle, WA' + } + + public function testDatabase6(){ + $this->assertEquals('Seattle, WA', 'Seattle, WA'); //check if MongoDB returned 'Seattle, WA' + } + + public function testDatabase7(){ + $this->assertEquals('Seattle, WA', 'Seattle, WA'); //check if MongoDB returned 'Seattle, WA' + } + + public function testDatabase8()){ + $this->assertEquals('Seattle, WA', 'Seattle, WA'); //check if MongoDB returned 'Seattle, WA' + } + + public function testDatabase9(){ + $this->assertEquals('Seattle, WA', 'Seattle, WA'); //check if MongoDB returned 'Seattle, WA' + } + + public function testDatabase10(){ + $this->assertEquals('Seattle, WA', 'Seattle, WA'); //check if MongoDB returned 'Seattle, WA' + } } ?> From 58ced32d964f1d6c8f62e0acb43f3854467f0436 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Mon, 11 Apr 2016 21:51:52 -0700 Subject: [PATCH 61/91] Update ConnectToMongoTest.php --- tests/ConnectToMongoTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/ConnectToMongoTest.php b/tests/ConnectToMongoTest.php index de212db..9b312dc 100644 --- a/tests/ConnectToMongoTest.php +++ b/tests/ConnectToMongoTest.php @@ -30,7 +30,7 @@ public function testDatabase7(){ $this->assertEquals('Seattle, WA', 'Seattle, WA'); //check if MongoDB returned 'Seattle, WA' } - public function testDatabase8()){ + public function testDatabase8(){ $this->assertEquals('Seattle, WA', 'Seattle, WA'); //check if MongoDB returned 'Seattle, WA' } From 6af2cefbc7fbb89ce9b9d905e859e678188933d7 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Mon, 25 Apr 2016 17:15:52 -0700 Subject: [PATCH 62/91] Update shippable.yml --- shippable.yml | 37 +++++++++---------------------------- 1 file changed, 9 insertions(+), 28 deletions(-) diff --git a/shippable.yml b/shippable.yml index c5382d7..721c734 100644 --- a/shippable.yml +++ b/shippable.yml @@ -3,39 +3,20 @@ language: php php: - 5.4 - 5.5 - - 5.6 - - 7.0 - - hhvm services: - rabbitmq build: + pre_ci_boot: + image_name: drydock/u14pyt + image_tag: prod + pull: true + options: "--net=host" ci: - - if [ "$SHIPPABLE_PHP_VERSION" == 5.6 ]; then - cd $HOME/phpenv; - git pull; - /usr/local/bin/phpenv-install 5.6.20; - 'eval "$(phpenv init -)"'; - $HOME/.phpenv/bin/phpenv global 5.6.20; - php --version; - curl -s http://getcomposer.org/installer | php; - chmod +x composer.phar; - mv composer.phar $HOME/.phpenv/versions/5.6.20/bin/composer; - fi; - - composer self-update - - composer install --no-progress --no-interaction --prefer-source - - wget https://xdebug.org/files/xdebug-2.4.0.tgz - - tar -xvzf xdebug-2.4.0.tgz - - cd xdebug-2.4.0 - - phpize - - ./configure - - make - - if [ "$SHIPPABLE_PHP_VERSION" == 5.4 ]; then cp modules/xdebug.so /root/.phpenv/versions/5.4/lib/php/extensions/no-debug-non-zts-20100525; fi - - if [ "$SHIPPABLE_PHP_VERSION" == 5.5 ]; then cp modules/xdebug.so /root/.phpenv/versions/5.5/lib/php/extensions/no-debug-non-zts-20121212; fi - - if [ "$SHIPPABLE_PHP_VERSION" == 5.6 ]; then cp modules/xdebug.so /root/.phpenv/versions/5.6.20/lib/php/extensions/no-debug-non-zts-20131226; fi - - if [ "$SHIPPABLE_PHP_VERSION" == 7.0 ]; then cp modules/xdebug.so /root/.phpenv/versions/7.0/lib/php/extensions/no-debug-non-zts-20151012; fi - - cd .. + - docker ps + - docker run -d -p 27017:27017 mongo + - docker ps + - mongo -v - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage - - vendor/phpunit/phpunit/phpunit --log-junit shippable/testresults/junit.xml --coverage-xml shippable/codecoverage -c phpunit.xml From 786fb44aa4b629972ec46e06ee2a23585f812f8c Mon Sep 17 00:00:00 2001 From: a-murphy Date: Mon, 25 Apr 2016 17:20:32 -0700 Subject: [PATCH 63/91] Update shippable.yml --- shippable.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/shippable.yml b/shippable.yml index 721c734..50f9e5c 100644 --- a/shippable.yml +++ b/shippable.yml @@ -1,12 +1,5 @@ -language: php +language: python -php: - - 5.4 - - 5.5 - -services: - - rabbitmq - build: pre_ci_boot: image_name: drydock/u14pyt From 6ec06d282d7da28f26ca11d8282497c84387741a Mon Sep 17 00:00:00 2001 From: a-murphy Date: Mon, 25 Apr 2016 17:22:08 -0700 Subject: [PATCH 64/91] Update shippable.yml --- shippable.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/shippable.yml b/shippable.yml index 50f9e5c..09f05e4 100644 --- a/shippable.yml +++ b/shippable.yml @@ -1,15 +1,3 @@ -language: python - build: - pre_ci_boot: - image_name: drydock/u14pyt - image_tag: prod - pull: true - options: "--net=host" ci: - - docker ps - - docker run -d -p 27017:27017 mongo - - docker ps - - mongo -v - - mkdir -p shippable/testresults - - mkdir -p shippable/codecoverage + - echo "true" From 4c49e5e0a71f6b4d30afe1238b2e442ae4d92e67 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Mon, 25 Apr 2016 17:32:13 -0700 Subject: [PATCH 65/91] Update shippable.yml --- shippable.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 09f05e4..50f9e5c 100644 --- a/shippable.yml +++ b/shippable.yml @@ -1,3 +1,15 @@ +language: python + build: + pre_ci_boot: + image_name: drydock/u14pyt + image_tag: prod + pull: true + options: "--net=host" ci: - - echo "true" + - docker ps + - docker run -d -p 27017:27017 mongo + - docker ps + - mongo -v + - mkdir -p shippable/testresults + - mkdir -p shippable/codecoverage From 369d4575124a852eff5be2a399321a669ea974d9 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Mon, 25 Apr 2016 17:34:23 -0700 Subject: [PATCH 66/91] Update shippable.yml --- shippable.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shippable.yml b/shippable.yml index 50f9e5c..7494acb 100644 --- a/shippable.yml +++ b/shippable.yml @@ -8,8 +8,8 @@ build: options: "--net=host" ci: - docker ps - - docker run -d -p 27017:27017 mongo + - docker run -d -p 27018:27017 mongo - docker ps - - mongo -v + - mongo 127.0.0.1:27018 - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage From 535a2f789141d3c783cac45b0f578ad064dfe571 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Mon, 25 Apr 2016 17:37:42 -0700 Subject: [PATCH 67/91] Update shippable.yml --- shippable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/shippable.yml b/shippable.yml index 7494acb..13bbbd6 100644 --- a/shippable.yml +++ b/shippable.yml @@ -10,6 +10,7 @@ build: - docker ps - docker run -d -p 27018:27017 mongo - docker ps + - apt-get install mongodb-org-shell - mongo 127.0.0.1:27018 - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage From 678a4ceebf9b2a2bf23c0aa35a02b389c1b3808a Mon Sep 17 00:00:00 2001 From: a-murphy Date: Mon, 25 Apr 2016 17:40:14 -0700 Subject: [PATCH 68/91] Update shippable.yml --- shippable.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/shippable.yml b/shippable.yml index 13bbbd6..d9840d5 100644 --- a/shippable.yml +++ b/shippable.yml @@ -10,6 +10,9 @@ build: - docker ps - docker run -d -p 27018:27017 mongo - docker ps + - sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv EA312927 + - echo "deb http://repo.mongodb.org/apt/ubuntu trusty/mongodb-org/3.2 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.2.list + - sudo apt-get update - apt-get install mongodb-org-shell - mongo 127.0.0.1:27018 - mkdir -p shippable/testresults From 27ae74694905ff8ba638bf6350ed54426d3b7f46 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Mon, 25 Apr 2016 17:41:25 -0700 Subject: [PATCH 69/91] Update shippable.yml --- shippable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/shippable.yml b/shippable.yml index d9840d5..6ad2d3e 100644 --- a/shippable.yml +++ b/shippable.yml @@ -7,6 +7,7 @@ build: pull: true options: "--net=host" ci: + - docker rm gloomy_mahavira - docker ps - docker run -d -p 27018:27017 mongo - docker ps From b370eea519b3191f98c21ed12573edda0940f51b Mon Sep 17 00:00:00 2001 From: a-murphy Date: Mon, 25 Apr 2016 17:42:17 -0700 Subject: [PATCH 70/91] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 6ad2d3e..ea171cf 100644 --- a/shippable.yml +++ b/shippable.yml @@ -7,7 +7,7 @@ build: pull: true options: "--net=host" ci: - - docker rm gloomy_mahavira + - docker stop gloomy_mahavira && docker rm gloomy_mahavira - docker ps - docker run -d -p 27018:27017 mongo - docker ps From 76ff67903edaff8946915056908184441d435c37 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Mon, 25 Apr 2016 17:50:48 -0700 Subject: [PATCH 71/91] Update shippable.yml --- shippable.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/shippable.yml b/shippable.yml index ea171cf..c562406 100644 --- a/shippable.yml +++ b/shippable.yml @@ -1,13 +1,15 @@ language: python build: + pre_ci: + - docker ps pre_ci_boot: - image_name: drydock/u14pyt - image_tag: prod - pull: true - options: "--net=host" + image_name: drydock/u14pyt + image_tag: prod + pull: true + options: "--net=host" ci: - - docker stop gloomy_mahavira && docker rm gloomy_mahavira + - docker stop sad_swartz && docker rm sad_swartz - docker ps - docker run -d -p 27018:27017 mongo - docker ps From f86cfa316725414c454b985f4d9e59afc88a1d83 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Mon, 25 Apr 2016 17:52:59 -0700 Subject: [PATCH 72/91] Update shippable.yml --- shippable.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index c562406..7624fe4 100644 --- a/shippable.yml +++ b/shippable.yml @@ -9,7 +9,8 @@ build: pull: true options: "--net=host" ci: - - docker stop sad_swartz && docker rm sad_swartz + - docker stop lonely_poitras && docker rm lonely_poitras + - docker stop ecstatic_hoover && docker rm ecstatic_hoover - docker ps - docker run -d -p 27018:27017 mongo - docker ps From 170b95515b71994c4d3843c4f491fcc02092492e Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 26 Apr 2016 10:44:14 -0700 Subject: [PATCH 73/91] Update shippable.yml --- shippable.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/shippable.yml b/shippable.yml index 7624fe4..54b18be 100644 --- a/shippable.yml +++ b/shippable.yml @@ -9,15 +9,6 @@ build: pull: true options: "--net=host" ci: - - docker stop lonely_poitras && docker rm lonely_poitras - - docker stop ecstatic_hoover && docker rm ecstatic_hoover - docker ps - - docker run -d -p 27018:27017 mongo - - docker ps - - sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv EA312927 - - echo "deb http://repo.mongodb.org/apt/ubuntu trusty/mongodb-org/3.2 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.2.list - - sudo apt-get update - - apt-get install mongodb-org-shell - - mongo 127.0.0.1:27018 - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage From c98486fc3fd0ea56c7596f7489daf96d485dce7c Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 26 Apr 2016 16:44:01 -0700 Subject: [PATCH 74/91] Update shippable.yml --- shippable.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 54b18be..9b9bce1 100644 --- a/shippable.yml +++ b/shippable.yml @@ -9,6 +9,9 @@ build: pull: true options: "--net=host" ci: - - docker ps + - docker run -p 27017:27017 --name=my_container_name mongo - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage + - return 1 + on_failure: + - docker logs --tail=100 my_container_name From cfc30a4f6f1534e13bbef50793e3e4e0a352779b Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 26 Apr 2016 16:47:40 -0700 Subject: [PATCH 75/91] Update shippable.yml --- shippable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/shippable.yml b/shippable.yml index 9b9bce1..207ab03 100644 --- a/shippable.yml +++ b/shippable.yml @@ -15,3 +15,4 @@ build: - return 1 on_failure: - docker logs --tail=100 my_container_name + From a40a608af1475d2c278bd48fe2e251ff9d3b83f4 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 26 Apr 2016 17:06:08 -0700 Subject: [PATCH 76/91] Update shippable.yml --- shippable.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 207ab03..74bfd17 100644 --- a/shippable.yml +++ b/shippable.yml @@ -9,10 +9,12 @@ build: pull: true options: "--net=host" ci: - - docker run -p 27017:27017 --name=my_container_name mongo + - docker run -d -p 27017:27017 --name=my_container_name mongo - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage - return 1 on_failure: - docker logs --tail=100 my_container_name + - docker stop my_container_name + - docker rm my_container_name From 3e2ef294650dd064a5432ef52fbd4bad7530de0c Mon Sep 17 00:00:00 2001 From: a-murphy Date: Wed, 27 Apr 2016 15:58:09 -0700 Subject: [PATCH 77/91] Update shippable.yml --- shippable.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/shippable.yml b/shippable.yml index 74bfd17..763d12a 100644 --- a/shippable.yml +++ b/shippable.yml @@ -4,10 +4,10 @@ build: pre_ci: - docker ps pre_ci_boot: - image_name: drydock/u14pyt - image_tag: prod + image_name: 544102397216.dkr.ecr.us-west-2.amazonaws.com/testrepository + image_tag: latest pull: true - options: "--net=host" + options: "--net=host -e HOME=/root" ci: - docker run -d -p 27017:27017 --name=my_container_name mongo - mkdir -p shippable/testresults @@ -18,3 +18,10 @@ build: - docker stop my_container_name - docker rm my_container_name +integrations: + hub: + - integrationName: AWS + type: docker + branches: + only: + - master From 53664ff7e0118045d0283a1dc2244ecc2a062074 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Wed, 27 Apr 2016 16:01:56 -0700 Subject: [PATCH 78/91] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 763d12a..9e11d47 100644 --- a/shippable.yml +++ b/shippable.yml @@ -20,7 +20,7 @@ build: integrations: hub: - - integrationName: AWS + - integrationName: ECR type: docker branches: only: From 12f580c068ce3412d3c101dc5cdfa8558d9ded92 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Wed, 27 Apr 2016 16:04:53 -0700 Subject: [PATCH 79/91] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 9e11d47..bd88847 100644 --- a/shippable.yml +++ b/shippable.yml @@ -21,7 +21,7 @@ build: integrations: hub: - integrationName: ECR - type: docker + type: ecr branches: only: - master From 3528b480a362d3aa5396293dd771b681decc3bc5 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Wed, 27 Apr 2016 16:05:46 -0700 Subject: [PATCH 80/91] Update shippable.yml --- shippable.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/shippable.yml b/shippable.yml index bd88847..85f0327 100644 --- a/shippable.yml +++ b/shippable.yml @@ -22,6 +22,3 @@ integrations: hub: - integrationName: ECR type: ecr - branches: - only: - - master From 5c6a8652c469625b1093dd334cd2b3bb80756dff Mon Sep 17 00:00:00 2001 From: a-murphy Date: Wed, 27 Apr 2016 16:07:20 -0700 Subject: [PATCH 81/91] Update shippable.yml --- shippable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/shippable.yml b/shippable.yml index 85f0327..280d0af 100644 --- a/shippable.yml +++ b/shippable.yml @@ -22,3 +22,4 @@ integrations: hub: - integrationName: ECR type: ecr + region: us-west-2 From 810095b247624a2321461ee4b1787d5794d328d0 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Fri, 29 Apr 2016 15:05:33 -0700 Subject: [PATCH 82/91] Update shippable.yml --- shippable.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/shippable.yml b/shippable.yml index 280d0af..2f536ee 100644 --- a/shippable.yml +++ b/shippable.yml @@ -3,20 +3,14 @@ language: python build: pre_ci: - docker ps - pre_ci_boot: - image_name: 544102397216.dkr.ecr.us-west-2.amazonaws.com/testrepository - image_tag: latest - pull: true - options: "--net=host -e HOME=/root" ci: - - docker run -d -p 27017:27017 --name=my_container_name mongo + # - docker run -d -p 27017:27017 --name=my_container_name mongo - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage - return 1 - on_failure: - - docker logs --tail=100 my_container_name - - docker stop my_container_name - - docker rm my_container_name + push: + - docker tag $SHIPPABLE_BUILD_CONTAINER 544102397216.dkr.ecr.us-west-2.amazonaws.com/testrepository:testpush + - docker push 544102397216.dkr.ecr.us-west-2.amazonaws.com/testrepository:testpush integrations: hub: From aaeca16114fa03bcf776c81ba4ddd5406322b6ee Mon Sep 17 00:00:00 2001 From: a-murphy Date: Fri, 29 Apr 2016 15:10:08 -0700 Subject: [PATCH 83/91] Update shippable.yml --- shippable.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 2f536ee..7550e58 100644 --- a/shippable.yml +++ b/shippable.yml @@ -7,7 +7,6 @@ build: # - docker run -d -p 27017:27017 --name=my_container_name mongo - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage - - return 1 push: - docker tag $SHIPPABLE_BUILD_CONTAINER 544102397216.dkr.ecr.us-west-2.amazonaws.com/testrepository:testpush - docker push 544102397216.dkr.ecr.us-west-2.amazonaws.com/testrepository:testpush From 5e3cbe2b26fb143f6a06e7dd0dbc6b4b8e3eaee5 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Fri, 29 Apr 2016 15:11:40 -0700 Subject: [PATCH 84/91] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 7550e58..3a227cc 100644 --- a/shippable.yml +++ b/shippable.yml @@ -8,7 +8,7 @@ build: - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage push: - - docker tag $SHIPPABLE_BUILD_CONTAINER 544102397216.dkr.ecr.us-west-2.amazonaws.com/testrepository:testpush + - docker tag $SHIPPABLE_CONTAINER_NAME 544102397216.dkr.ecr.us-west-2.amazonaws.com/testrepository:testpush - docker push 544102397216.dkr.ecr.us-west-2.amazonaws.com/testrepository:testpush integrations: From 8a0daffcfe4ce3238b3cd2596a68a667c2f8abed Mon Sep 17 00:00:00 2001 From: a-murphy Date: Fri, 29 Apr 2016 15:12:42 -0700 Subject: [PATCH 85/91] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 3a227cc..b1eb51c 100644 --- a/shippable.yml +++ b/shippable.yml @@ -8,7 +8,7 @@ build: - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage push: - - docker tag $SHIPPABLE_CONTAINER_NAME 544102397216.dkr.ecr.us-west-2.amazonaws.com/testrepository:testpush + - docker tag drydock/u14nod:prod 544102397216.dkr.ecr.us-west-2.amazonaws.com/testrepository:testpush - docker push 544102397216.dkr.ecr.us-west-2.amazonaws.com/testrepository:testpush integrations: From fcd6dc696fb3ab2a2872af84ad924cabf8e93d90 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Fri, 29 Apr 2016 15:26:20 -0700 Subject: [PATCH 86/91] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index b1eb51c..c8a6a52 100644 --- a/shippable.yml +++ b/shippable.yml @@ -15,4 +15,4 @@ integrations: hub: - integrationName: ECR type: ecr - region: us-west-2 + # region: us-west-2 From fc4f89cd4038f2902f02bb5b5265885ca2937559 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Fri, 29 Apr 2016 15:28:34 -0700 Subject: [PATCH 87/91] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index c8a6a52..8f84f8c 100644 --- a/shippable.yml +++ b/shippable.yml @@ -8,7 +8,7 @@ build: - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage push: - - docker tag drydock/u14nod:prod 544102397216.dkr.ecr.us-west-2.amazonaws.com/testrepository:testpush + - docker tag drydock/u14nod:prod 544102397216.dkr.ecr.us-west-2.amazonaws.com/testrepository:testpush2 - docker push 544102397216.dkr.ecr.us-west-2.amazonaws.com/testrepository:testpush integrations: From 293a36dd608cc6830ad199fcdc4e0d64c49c9b7c Mon Sep 17 00:00:00 2001 From: a-murphy Date: Fri, 29 Apr 2016 15:30:45 -0700 Subject: [PATCH 88/91] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 8f84f8c..d2d78db 100644 --- a/shippable.yml +++ b/shippable.yml @@ -15,4 +15,4 @@ integrations: hub: - integrationName: ECR type: ecr - # region: us-west-2 + region: us-east-1 From 63ab9bd2251c627a56376d78c8988c2bf7b8c030 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Fri, 29 Apr 2016 15:31:41 -0700 Subject: [PATCH 89/91] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index d2d78db..49ca57f 100644 --- a/shippable.yml +++ b/shippable.yml @@ -8,7 +8,7 @@ build: - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage push: - - docker tag drydock/u14nod:prod 544102397216.dkr.ecr.us-west-2.amazonaws.com/testrepository:testpush2 + - docker tag -f drydock/u14nod:prod 544102397216.dkr.ecr.us-west-2.amazonaws.com/testrepository:testpush2 - docker push 544102397216.dkr.ecr.us-west-2.amazonaws.com/testrepository:testpush integrations: From f6cae1216319add33493468c14b7fe4a92f969ca Mon Sep 17 00:00:00 2001 From: a-murphy Date: Fri, 29 Apr 2016 15:31:58 -0700 Subject: [PATCH 90/91] Update shippable.yml --- shippable.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/shippable.yml b/shippable.yml index 49ca57f..b05662b 100644 --- a/shippable.yml +++ b/shippable.yml @@ -7,7 +7,6 @@ build: # - docker run -d -p 27017:27017 --name=my_container_name mongo - mkdir -p shippable/testresults - mkdir -p shippable/codecoverage - push: - docker tag -f drydock/u14nod:prod 544102397216.dkr.ecr.us-west-2.amazonaws.com/testrepository:testpush2 - docker push 544102397216.dkr.ecr.us-west-2.amazonaws.com/testrepository:testpush @@ -15,4 +14,4 @@ integrations: hub: - integrationName: ECR type: ecr - region: us-east-1 + # region: us-east-1 From a6bc78481cb7e28d596de1159eab4a8a958365ab Mon Sep 17 00:00:00 2001 From: a-murphy Date: Fri, 29 Apr 2016 15:32:43 -0700 Subject: [PATCH 91/91] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index b05662b..28dcd43 100644 --- a/shippable.yml +++ b/shippable.yml @@ -14,4 +14,4 @@ integrations: hub: - integrationName: ECR type: ecr - # region: us-east-1 + region: us-west-2