X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=ci%2Fdeps.perl;h=77d95fc8e749071237ea03dec9ff438950393f00;hb=29c5f2a6fc3b86306a5dbeadfae061d06f2bc6dd;hp=ad2c11d28f6bc1a4e48799d4d6d8447ec3ad6d67;hpb=2b18e497086cb92d86d41e842c75feb1a28e9053;p=public-inbox.git
diff --git a/ci/deps.perl b/ci/deps.perl
index ad2c11d2..77d95fc8 100755
--- a/ci/deps.perl
+++ b/ci/deps.perl
@@ -1,5 +1,5 @@
#!/usr/bin/perl -w
-# Copyright (C) 2019 all contributors
+# Copyright (C) 2019-2020 all contributors
# License: AGPL-3.0+
# Helper script for installing/uninstalling packages for CI use
# Intended for use on non-production chroots or VMs since it
@@ -9,38 +9,33 @@ my $usage = "$0 PKG_FMT PROFILE [PROFILE_MOD]";
my $pkg_fmt = shift;
@ARGV or die $usage, "\n";
-my @test_essential = qw(Test::Simple Plack::Test);
+my @test_essential = qw(Test::Simple); # we actually use Test::More
# package profiles
my $profiles = {
# the smallest possible profile for testing
- # TODO: trim this, Plack pulls in Filesys::Notify::Simple,
- # and we don't need that for mda-only installs
+ # TODO: trim URI::Escape from this, maybe
essential => [ qw(
git
perl
- Date::Parse
Devel::Peek
Digest::SHA
- Email::Simple
- Email::MIME
- Email::MIME::ContentType
Encode
ExtUtils::MakeMaker
- Filesys::Notify::Simple
- Plack
+ IO::Compress::Gzip
URI::Escape
), @test_essential ],
# everything optional for normal use
optional => [ qw(
+ Date::Parse
BSD::Resource
DBD::SQLite
DBI
- IO::Compress::Gzip
Inline::C
Net::Server
- Plack::Middleware::Deflater
+ Plack
+ Plack::Test
Plack::Middleware::ReverseProxy
Search::Xapian
Socket6
@@ -50,8 +45,7 @@ my $profiles = {
# optional developer stuff
devtest => [ qw(
- IPC::Run
- XML::Feed
+ XML::TreePP
curl
w3m
) ],
@@ -60,7 +54,7 @@ my $profiles = {
# account for granularity differences between package systems and OSes
my @precious;
if ($^O eq 'freebsd') {
- @precious = qw(perl curl Socket6 IO::Compress::Gzip IO::KQueue);
+ @precious = qw(perl curl Socket6 IO::Compress::Gzip);
} elsif ($pkg_fmt eq 'rpm') {
@precious = qw(perl curl);
}
@@ -149,6 +143,9 @@ my (@pkg_install, @pkg_remove, %all);
for my $ary (values %$profiles) {
$all{$_} = \@pkg_remove for @$ary;
}
+if ($^O eq 'freebsd') {
+ $all{'IO::KQueue'} = \@pkg_remove;
+}
$profiles->{all} = [ keys %all ]; # pseudo-profile for all packages
# parse the profile list from the command-line