From 059d0319dbb5c18abcc7b594935916ef4e5c875c Mon Sep 17 00:00:00 2001 From: "Avi (Ananya) Das" Date: Thu, 19 Feb 2015 16:47:19 -0600 Subject: [PATCH 1/4] Change to hosted paypal favicon --- docs/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.html b/docs/index.html index 5fb879d..8fe74cb 100644 --- a/docs/index.html +++ b/docs/index.html @@ -6,7 +6,7 @@ - + PayPal PHP SDK - Welcome From e36b0ef0e3353aa512db84c770d877ea51894659 Mon Sep 17 00:00:00 2001 From: "Avi (Ananya) Das" Date: Thu, 19 Feb 2015 16:50:48 -0600 Subject: [PATCH 2/4] Change docs to refer to travis --- generate-api.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generate-api.sh b/generate-api.sh index f47b34a..be8c358 100644 --- a/generate-api.sh +++ b/generate-api.sh @@ -2,7 +2,7 @@ # Get ApiGen.phar wget http://www.apigen.org/apigen.phar -# Generate Api +# Generate SDK Docs php apigen.phar generate --template-theme="bootstrap" -s lib -d ../gh-pages/docs # Copy Home Page from Master Branch to Gh-Pages folder @@ -26,5 +26,5 @@ git checkout -B gh-pages # Push generated files git add . -git commit -m "API updated" +git commit -m "Docs updated by Travis" git push origin gh-pages -fq > /dev/null From 57d4f28dbda2e98be703afae8a8827d6e714f8f2 Mon Sep 17 00:00:00 2001 From: "Avi (Ananya) Das" Date: Thu, 19 Feb 2015 16:58:37 -0600 Subject: [PATCH 3/4] Don't generate docs if it is a pull request --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e3e53e6..f9fd3c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ script: - phpunit after_success: - php vendor/bin/coveralls -v -c .coveralls.yml -- if [ $TRAVIS_PHP_VERSION = '5.6' ]; then sh generate-api.sh; fi +- if [ $TRAVIS_PHP_VERSION = '5.6' ] && [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then sh generate-api.sh; fi notifications: email: recipients: From 5e2ad80f4575daa7b5514d4e3a252f3f9a6c49fa Mon Sep 17 00:00:00 2001 From: Jay Patel Date: Thu, 19 Feb 2015 17:31:47 -0600 Subject: [PATCH 4/4] More Restrains to Docs Generator - Run Doc Generator only on master branch --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f9fd3c6..9292c79 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ script: - phpunit after_success: - php vendor/bin/coveralls -v -c .coveralls.yml -- if [ $TRAVIS_PHP_VERSION = '5.6' ] && [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then sh generate-api.sh; fi +- if [ $TRAVIS_PHP_VERSION = '5.6' ] && [ $TRAVIS_BRANCH = 'master' ] && [ $TRAVIS_PULL_REQUEST = 'false' ]; then sh generate-api.sh; fi notifications: email: recipients: