Skip to content

Commit

Permalink
Temporary CI workaround for RT#92226
Browse files Browse the repository at this point in the history
  • Loading branch information
ribasushi committed Jan 19, 2014
1 parent cef91ee commit 647da28
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
10 changes: 6 additions & 4 deletions maint/travis-ci_scripts/30_before_script.bash
Expand Up @@ -59,12 +59,14 @@ if [[ "$CLEANTEST" = "true" ]]; then
# latest T::B here, so that it will not show up as a dependency, and
# hence it will not get installed a second time as an unsatisfied dep
# under cpanm --dev
installdeps 'Test::Builder~<1.005'
#
# L::U is a workaround for RT#92226 (argh)
installdeps 'Test::Builder~<1.005' 'List::Util~!=1.36'

elif ! CPAN_is_sane ; then
# no configure_requires - we will need the usual suspects anyway
# without pre-installing these in one pass things like extract_prereqs won't work
installdeps ExtUtils::MakeMaker ExtUtils::CBuilder Module::Build
installdeps ExtUtils::MakeMaker ExtUtils::CBuilder Module::Build P/PE/PEVANS/Scalar-List-Utils-1.35.tar.gz

fi

Expand All @@ -89,7 +91,7 @@ else
parallel_installdeps_notest File::Path
parallel_installdeps_notest Carp
parallel_installdeps_notest Module::Build
parallel_installdeps_notest File::Spec Data::Dumper Module::Runtime
parallel_installdeps_notest File::Spec Data::Dumper Module::Runtime 'List::Util~<1.36'
parallel_installdeps_notest Test::Exception Encode::Locale Test::Fatal
parallel_installdeps_notest Test::Warn B::Hooks::EndOfScope Test::Differences HTTP::Status
parallel_installdeps_notest Test::Pod::Coverage Test::EOL Devel::GlobalDestruction Sub::Name MRO::Compat Class::XSAccessor URI::Escape HTML::Entities
Expand Down Expand Up @@ -195,7 +197,7 @@ while (@chunks) {
else

# listalldeps is deliberate - will upgrade everything it can find
parallel_installdeps_notest $(make listalldeps)
parallel_installdeps_notest $(make listalldeps | grep -v List::Util)

fi

Expand Down
8 changes: 6 additions & 2 deletions maint/travis-ci_scripts/common.bash
Expand Up @@ -167,11 +167,15 @@ _dep_inst_with_test() {
for m in "$@"; do
if ! perl -e '
eval ( q{require } . (
my $mod = (
$ARGV[0] =~ m{ \/ .*? ([^\/]+) $ }x
? do { my @p = split (/\-/, $1); pop @p; join "::", @p }
: $ARGV[0]
) ) or ( print $@ and exit 1)
);
$mod = q{List::Util} if $mod eq q{Scalar::List::Utils};
eval qq{require($mod)} or ( print $@ and exit 1)
' "$m" 2> /dev/null ; then
echo -e "$m installation seems to have failed"
Expand Down

0 comments on commit 647da28

Please sign in to comment.