aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml10
1 files changed, 6 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 86b6b3b46c..58d19a09f9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,10 +47,12 @@ before_script:
- "make after-update BASERUBY=ruby UNICODE_FILES=."
- "make -s $JOBS"
- "make update-rubyspec"
- - "${RUBYSPEC_PULL_REQUEST:+git -C spec/rubyspec -c user.email=none -c user.name=none
- pull --no-edit origin $(for rev in ${RUBYSPEC_PULL_REQUEST//,/ }; do
- echo +refs/pull/$rev/merge:;
- done)}"
+ - "if [ -n \"${RUBYSPEC_PULL_REQUEST}\" ]\n
+ then\n
+ merge=\n
+ for rev in ${RUBYSPEC_PULL_REQUEST//,/ }; do merge=\"$merge +refs/pull/$rev/merge:\"; done\n
+ git -C spec/rubyspec -c user.email=none -c user.name=none pull --no-edit origin $merge\n
+ fi"
script:
- "make -s test TESTOPTS=--color=never"