X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=maint%2Ftravis-ci_scripts%2F30_before_script.bash;h=21df67fc47207bc031a392f12b89a89e34287024;hb=32871272c1fa5d098895fb3d6d2b2ed3640f371b;hp=091e155550afaf2f09b0ad9799105c2206797c4c;hpb=fe21f2224c1dcf8c1107bde8ea7b21e6ca7b994c;p=dbsrgits%2FDBIx-Class.git

diff --git a/maint/travis-ci_scripts/30_before_script.bash b/maint/travis-ci_scripts/30_before_script.bash
old mode 100755
new mode 100644
index 091e155..21df67f
--- a/maint/travis-ci_scripts/30_before_script.bash
+++ b/maint/travis-ci_scripts/30_before_script.bash
@@ -12,8 +12,6 @@ if [[ "$DEVREL_DEPS" == "true" ]] ; then
 fi
 
 # Need a shitton of patches to run on cperl (luckily all provided)
-# Also need to have YAML in place, otherwise the distroprefs are not readable
-# (cperl 5.22.2 comes with YAML already)
 if is_cperl ; then
 
   run_or_err "Downloading and installing cperl distroprefs" '
@@ -21,7 +19,13 @@ if is_cperl ; then
     tar -C $HOME/.cpan --strip-components 1 -zx distroprefs-master/prefs distroprefs-master/sources
   '
 
-  perl -M5.022002 -e1 &>/dev/null || installdeps YAML
+  # Argh -DFORTIFY_INC!!!
+  # FIXME - remove when M::I is gone
+  export PERL5LIB="$PERL5LIB:."
+
+  # Also need to have YAML in place, otherwise the distroprefs are not readable
+  # work around https://github.com/perl11/cperl/issues/155#issuecomment-224862978
+  perl -MYAML -e1 &>/dev/null || installdeps YAML
 
 fi
 
@@ -101,24 +105,12 @@ if [[ "$CLEANTEST" = "true" ]]; then
   # the point is to have a *really* clean perl (the ones
   # we build are guaranteed to be clean, without side
   # effects from travis preinstalls)
+  #
+  # trick cpanm into executing true as shell - we just need the find+unpack
+  [[ -d ~/.cpanm/latest-build/DBIx-Class-*/inc ]] || run_or_err "Downloading latest stable DBIC inc/ from CPAN" \
+    "SHELL=/bin/true cpanm --look DBIx::Class"
 
-  # work around https://github.com/perl11/cperl/issues/145 (no cpanm)
-  if is_cperl ; then
-
-    wget -qO- $( wget -qO- http://cpanmetadb.plackperl.org/v1.0/package/DBIx::Class | grep distfile | sed "s|distfile:\s*|$CPAN_MIRROR/authors/id/|" ) \
-  | tar -zx --strip-components 1 --wildcards '*/inc'
-
-    # FIXME - kill this when M::I is gone
-    # Argh -DFORTIFY_INC!!!
-    export PERL5LIB="$PERL5LIB:."
-
-  else
-    # trick cpanm into executing true as shell - we just need the find+unpack
-    [[ -d ~/.cpanm/latest-build/DBIx-Class-*/inc ]] || run_or_err "Downloading latest stable DBIC inc/ from CPAN" \
-      "SHELL=/bin/true cpanm --look DBIx::Class"
-
-    mv ~/.cpanm/latest-build/DBIx-Class-*/inc .
-  fi
+  mv ~/.cpanm/latest-build/DBIx-Class-*/inc .
 
   # The first CPAN which is somewhat sane is around 1.94_56 (perl 5.12)
   # The problem is that the first sane version also brings a *lot* of
@@ -193,6 +185,11 @@ if [[ "$CLEANTEST" = "true" ]]; then
 ##### END TEMPORARY WORKAROUNDS
   fi
 
+  # FIXME - work around RT#117844
+  if [[ "$BREWVER" == "5.10.0" ]]; then
+    unset PERL_UNICODE
+  fi
+
   installdeps $HARD_DEPS
 
   run_or_err "Re-configure" "perl Makefile.PL"