From: Peter Rabbitson Date: Thu, 28 May 2015 08:00:26 +0000 (+0200) Subject: (travis) Better shuffling of the prereq installation order X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=a966127df38eace329a352a718c14be2bca69800;p=dbsrgits%2FDBIx-Class.git (travis) Better shuffling of the prereq installation order --- diff --git a/maint/travis-ci_scripts/30_before_script.bash b/maint/travis-ci_scripts/30_before_script.bash index 1bd8837..513e3d3 100755 --- a/maint/travis-ci_scripts/30_before_script.bash +++ b/maint/travis-ci_scripts/30_before_script.bash @@ -114,11 +114,11 @@ if [[ "$CLEANTEST" = "true" ]]; then # we are doing a devrel pass - try to upgrade *everything* (we will be using cpanm so safe-ish) if [[ "$DEVREL_DEPS" == "true" ]] ; then - HARD_DEPS="$(echo $(make listalldeps))" + HARD_DEPS="$(make listalldeps | sort -R)" else - HARD_DEPS="$(echo $(make listdeps | sort -R))" + HARD_DEPS="$(make listdeps | sort -R)" ##### TEMPORARY WORKAROUNDS needed in case we will be using a fucked CPAN.pm if ! CPAN_is_sane ; then @@ -135,7 +135,7 @@ if [[ "$CLEANTEST" = "true" ]]; then else - parallel_installdeps_notest "$(make listdeps)" + parallel_installdeps_notest "$(make listdeps | sort -R)" fi