projects
/
dbsrgits/DBIx-Class.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(parent:
62f2092
)
(travis) Double check M::B::T is not pulled in (related to a872a9d7)
Peter Rabbitson [Tue, 9 Jun 2015 23:48:26 +0000 (
01:48
+0200)]
maint/travis-ci_scripts/30_before_script.bash
patch
|
blob
|
blame
|
history
maint/travis-ci_scripts/common.bash
patch
|
blob
|
blame
|
history
diff --git
a/maint/travis-ci_scripts/30_before_script.bash
b/maint/travis-ci_scripts/30_before_script.bash
index
a2b96cc
..
1bd8837
100755
(executable)
--- a/
maint/travis-ci_scripts/30_before_script.bash
+++ b/
maint/travis-ci_scripts/30_before_script.bash
@@
-159,6
+159,10
@@
if [[ "$POISON_ENV" = "true" ]] && ( perl -MDBD::SQLite\ 1.38 -e1 || perl -MDBI\
exit 1
fi
+if [[ "$CLEANTEST" = "true" ]] && perl -MModule::Build::Tiny -e1 &>/dev/null ; then
+ echo_err "Module::Build::Tiny pulled in during the basic depchain install - this must not happen"
+ exit 1
+fi
# announce what are we running
echo_err "
diff --git
a/maint/travis-ci_scripts/common.bash
b/maint/travis-ci_scripts/common.bash
index
0faf8a5
..
f890965
100755
(executable)
--- a/
maint/travis-ci_scripts/common.bash
+++ b/
maint/travis-ci_scripts/common.bash
@@
-253,9
+253,14
@@
purge_sitelib() {
{ (my $mp = $_ . ".pm" ) =~ s|::|/|g; $mp }
grep
{ $mcl_source !~ / ^ \s+ \x27 $_ \x27 \s* \=\> /mx }
- keys %{ DBIx::Class::Optional::Dependencies->modreq_list_for([
- keys %{ DBIx::Class::Optional::Dependencies->req_group_list }
- ])}
+ (
+ qw(
+ Module::Build::Tiny
+ ),
+ keys %{ DBIx::Class::Optional::Dependencies->modreq_list_for([
+ keys %{ DBIx::Class::Optional::Dependencies->req_group_list }
+ ])}
+ )
;
# now that we have the list we can go ahead and destroy every single one