From c5d62d79d3abf513dfd60fa6315bd6d8c5576cf6 Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Thu, 25 Jul 2013 11:31:44 +0400 Subject: [PATCH] cpanm is not available in travis' Ruby containers, exclude it --- Makefile | 8 +------- travisci.py | 1 - 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/Makefile b/Makefile index ba5022f7..108d8dbc 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ all: # setup: dotnet/.ok erlang/.ok java/.ok python/.ok php/.ok ruby-amqp/.ok ruby/.ok python-puka/.ok perl/.ok -setup-travisci: dotnet/.ok erlang/.ok java/.ok python/.ok ruby/.ok perl-cpanm/.ok +setup-travisci: dotnet/.ok erlang/.ok java/.ok python/.ok ruby/.ok test: setup RUBY=$(RUBY) python test.py @@ -139,12 +139,6 @@ perl/.ok: PERL_MM_USE_DEFAULT=1 cpan -i -f UUID::Tiny && \ touch .ok) -perl-cpanm/.ok: - (cd perl && \ - cpanm --notest -i Net::RabbitFoot && \ - cpanm --notest -i UUID::Tiny && \ - touch .ok) - clean:: (cd python-puka && \ rm -rf .ok venv distribute*.tar.gz) diff --git a/travisci.py b/travisci.py index 1641ab13..fec450c9 100755 --- a/travisci.py +++ b/travisci.py @@ -50,7 +50,6 @@ def gen(prog, arg="", **kwargs): } return [ ('python', './venv/bin/python %(prog)s.py %(arg)s' % ctx), - ('perl', 'perl %(prog)s.pl %(arg)s' % ctx), ('erlang', './%(prog)s.erl %(arg)s' % ctx), ('java', 'java -cp .:commons-io-1.2.jar:commons-cli-1.1.jar:' 'rabbitmq-client.jar %(java)s %(arg)s' % ctx),