Skip to content

Commit

Permalink
cpanm is not available in travis' Ruby containers, exclude it
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Klishin committed Jul 25, 2013
1 parent c69002d commit c5d62d7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
8 changes: 1 addition & 7 deletions Makefile
Expand Up @@ -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
Expand Down Expand Up @@ -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)
1 change: 0 additions & 1 deletion travisci.py
Expand Up @@ -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),
Expand Down

0 comments on commit c5d62d7

Please sign in to comment.