From: Peter Rabbitson Date: Sun, 21 Dec 2014 14:12:15 +0000 (+0100) Subject: (travis) Workaround for https://github.com/rjbs/Test-Deep/issues/22 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=17b09b77;p=dbsrgits%2FDBIx-Class.git (travis) Workaround for https://github.com/rjbs/Test-Deep/issues/22 --- diff --git a/maint/travis-ci_scripts/30_before_script.bash b/maint/travis-ci_scripts/30_before_script.bash index 135f319..85c8a09 100755 --- a/maint/travis-ci_scripts/30_before_script.bash +++ b/maint/travis-ci_scripts/30_before_script.bash @@ -57,6 +57,9 @@ if [[ "$CLEANTEST" = "true" ]]; then # handholding if [[ "$DEVREL_DEPS" == "true" ]] ; then + # FIXME - temporary workaround for https://github.com/rjbs/Test-Deep/issues/22 + installdeps R/RJ/RJBS/Test-Deep-0.113.tar.gz + # We are not "quite ready" for SQLA 1.99, do not consider it # installdeps 'SQL::Abstract~<1.99' @@ -117,6 +120,9 @@ if [[ "$CLEANTEST" = "true" ]]; then HARD_DEPS="$(echo $(make listalldeps))" + # FIXME - temporary workaround for https://github.com/rjbs/Test-Deep/issues/22 + HARD_DEPS="$(sed 's/Test::Deep//' <<< $HARD_DEPS)" + else HARD_DEPS="$(echo $(make listdeps))" @@ -124,6 +130,9 @@ if [[ "$CLEANTEST" = "true" ]]; then ##### TEMPORARY WORKAROUNDS needed in case we will be using a fucked CPAN.pm if ! CPAN_is_sane ; then + # FIXME - temporary workaround for https://github.com/rjbs/Test-Deep/issues/22 + HARD_DEPS="R/RJ/RJBS/Test-Deep-0.113.tar.gz $HARD_DEPS" + # DBD::SQLite reasonably wants DBI at config time perl -MDBI -e1 &>/dev/null || HARD_DEPS="DBI $HARD_DEPS"