From e189bf43235a5493bbde3d4e58643059cdd3ded0 Mon Sep 17 00:00:00 2001 From: Karen Etheridge Date: Mon, 14 May 2018 14:47:25 -0700 Subject: [PATCH] Fix use of travis environment variables, to properly detect pull requests --- dist.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist.ini b/dist.ini index 4576fe86d..c75060cd1 100644 --- a/dist.ini +++ b/dist.ini @@ -270,7 +270,7 @@ skip = ^Moose::Meta::TypeConstraint::Union$ [Test::ChangesHasContent] [Substitute] file = xt/release/changes_has_content.t -code = s{^(note 'Checking Changes')}{my \$branch_name = \$ENV\{TRAVIS_BRANCH\};\nchomp\(\$branch_name = \`git rev-parse --abbrev-ref HEAD\`\) if not \$branch_name;\nlocal \$TODO = 'Changes need not have content for this release yet if this is only the master branch'\n if \(\$branch_name \|\| ''\) eq 'master';\n\n$1} +code = s{^(note 'Checking Changes')}{if \(not \$ENV\{TRAVIS_PULL_REQUEST\}\) \{\n chomp\(my \$branch_name = \(\$ENV\{TRAVIS_BRANCH\} || \`git rev-parse --abbrev-ref HEAD\`\)\);\n \$TODO = 'Changes need not have content for this release yet if this is only the master branch'\n if \(\$branch_name \|\| ''\) eq 'master';\n\}\n\n$1} ;[CheckPrereqsIndexed]