diff options
| author | Björn Gustavsson <[email protected]> | 2018-07-09 10:00:19 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2018-07-09 10:00:19 +0200 |
| commit | aeea56792ca19f78bff65cd8300b3e5b0b041d55 (patch) | |
| tree | 0d1837b046cbcbaf4a8caa0f81dca3d0b1a4e38a /scripts | |
| parent | 10a0882f33111355714e476288f9cf887fdc0952 (diff) | |
| parent | d1a3136e72d38ce6cbe3f0292b7aa34e02b85cdc (diff) | |
| download | otp-aeea56792ca19f78bff65cd8300b3e5b0b041d55.tar.gz otp-aeea56792ca19f78bff65cd8300b3e5b0b041d55.tar.bz2 otp-aeea56792ca19f78bff65cd8300b3e5b0b041d55.zip | |
Merge branch 'lukas/travis/fix-doc-deploy' of github.com:garazdawi/otp
* 'lukas/travis/fix-doc-deploy' of github.com:garazdawi/otp:
travis: Only deploy in erlang/otp
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build-otp | 2 | ||||
| -rwxr-xr-x | scripts/bundle-otp | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/scripts/build-otp b/scripts/build-otp index c38d2c98de..abf8d5d67f 100755 --- a/scripts/build-otp +++ b/scripts/build-otp @@ -57,7 +57,7 @@ if [ "$1" = "docs" ]; then do_and_log "Linting documentation" make xmllint # The code below prepares this build to be used as a deploy to # github pages for documentation. - if [ "$TRAVIS_PULL_REQUEST" = "false" -a "$TRAVIS_TAG" = "" ]; then + if [ "$TRAVIS_PULL_REQUEST" = "false" -a "$TRAVIS_TAG" = "" -a "$TRAVIS_REPO_SLUG" = "erlang/otp" ]; then set -x rm -rf logs SHA=`git rev-parse --verify HEAD` diff --git a/scripts/bundle-otp b/scripts/bundle-otp index f3ff632b63..0ffe7d8c77 100755 --- a/scripts/bundle-otp +++ b/scripts/bundle-otp @@ -2,6 +2,10 @@ set -e +if [ "$TRAVIS_PULL_REQUEST" = "false" -a "$TRAVIS_REPO_SLUG" != "erlang/otp" ]; then + exit 0 +fi + OTP_META_FILE=$ERL_TOP/${TRAVIS_TAG}-bundle.txt OTP_FILE=$ERL_TOP/${TRAVIS_TAG}-bundle.tar.gz @@ -27,3 +31,5 @@ done cd $ERL_TOP/bundle/ tar czf $OTP_FILE * + +exit 0 |