[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  2da3f9687fc0efd56d1269dfda4c9ca5b388038a (commit)
      from  6a71e06d7aa02b857c8650aa94f6efd9d6531872 (commit)


- Log -----------------------------------------------------------------
commit 2da3f9687fc0efd56d1269dfda4c9ca5b388038a
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Apr 12 18:57:02 2017 +0200

    Correct travis.yml to only build extended tests when explicitely asked to
    
    The check for this was done by checking if $TRAVIS_EVENT_TYPE is
    "pull_request".  The trouble is that when new data is pushed to an
    already existing pull request, the event type is "push".
    
    Better then to go with another documented variable, $TRAVIS_PULL_REQUEST,
    which is "false" in non-PR builds.
    
    Ref: https://docs.travis-ci.com/user/environment-variables/#Default-Environment-Variables
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3205)

-----------------------------------------------------------------------

Summary of changes:
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 24214e9..cb08e40 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -146,7 +146,7 @@ matrix:
 
 before_script:
     - env
-    - if [ "$TRAVIS_EVENT_TYPE" == "pull_request" -a -n "$EXTENDED_TEST" ]; then
+    - if [ "$TRAVIS_PULL_REQUEST" != "false" -a -n "$EXTENDED_TEST" ]; then
           (git log -1 $TRAVIS_COMMIT_RANGE | grep '\[extended tests\]' > /dev/null) || exit 0;
       fi
     - if [ -n "$DESTDIR" ]; then