audreyso closed pull request #772: CB-13543: fixing check for travis master branch URL: https://github.com/apache/cordova-docs/pull/772
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/.travis.yml b/.travis.yml index 0a823a1d9..f378aa6d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,17 +7,5 @@ before_install: install: - npm install script: -- 'if [ $TRAVIS_BRANCH === "master" && $svn_pass ]; then - travis_wait 30 npm run-script build; - cd ..; - svn checkout --non-interactive --no-auth-cache --username=$svn_username --password=$svn_pass https://svn.apache.org/repos/asf/cordova/site cordova-website; - cp -R cordova-docs/build-prod/. cordova-website/public/; - cd cordova-website; - svn status | grep "?"; - svn add --force .; - svn --non-interactive --no-auth-cache --username=$svn_username --password=$svn_pass commit -m "Updated docs"; - cd ../cordova-docs; - npm test; - else - npm test; - fi' \ No newline at end of file + - chmod 755 buildAndDeploy.sh + - travis_wait 30 sleep infinity & ./buildAndDeploy.sh diff --git a/buildAndDeploy.sh b/buildAndDeploy.sh new file mode 100755 index 000000000..58d9a419f --- /dev/null +++ b/buildAndDeploy.sh @@ -0,0 +1,16 @@ +#!/bin/sh +if [ $svn_pass ] && [ $TRAVIS_BRANCH = "master" ] +then + npm run-script build; + cd ..; + svn checkout --non-interactive --no-auth-cache --username=$svn_username --password=$svn_pass https://svn.apache.org/repos/asf/cordova/site cordova-website; + cp -R cordova-docs/build-prod/. cordova-website/public/; + cd cordova-website || return; + svn status | grep "?"; + svn add --force .; + svn --non-interactive --no-auth-cache --username=$svn_username --password=$svn_pass commit -m "Updated docs"; + cd ../cordova-docs || return; + npm test; +else + npm test; +fi ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
