Merge branch 'miyagawa:devel' into devel

CPAN-Security · Jun 4, 2024 · 85df755 · 85df755
2 parents 5b13916 + c7f8136
commit 85df755
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 10 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -11,15 +11,29 @@ jobs:
       run:
         shell: 'script -q -e -c "bash {0}"' # create TTY so that -t STDIN works
     strategy:
+      fail-fast: false
       matrix:
         perl-version:
-          - '5.8-buster'
           - '5.10-buster'
-          - 'latest'
+          - '5.12-buster'
+          - '5.14-buster'
+          - '5.16-buster'
+          - '5.18-buster'
+          - '5.20-buster'
+          - '5.22-buster'
+          - '5.24-buster'
+          - '5.26-buster'
+          - '5.28-buster'
+          - '5.30-buster'
+          - '5.32-buster'
+          - '5.34-buster'
+          - '5.36-buster'
+          - '5.38-buster'
+          - 'devel'
     container:
       image: perl:${{ matrix.perl-version }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Install Dependencies
         run: |
           perl App-cpanminus/cpanm -nq App::cpanminus

diff --git a/App-cpanminus/Changes b/App-cpanminus/Changes
@@ -45,7 +45,7 @@ See http://github.com/miyagawa/cpanminus/ for the latest development.
       - Disable static_install when required modules are not installed
 
 1.7904  2018-04-20 23:20:15 CEST
-   [New Feaures]
+   [New Features]
       - Support dist, mirror and url options in cpanfile (#568)
 
 1.7903  2018-04-20 16:53:53 CEST

diff --git a/App-cpanminus/fatlib/CPAN/Meta/Check.pm b/App-cpanminus/fatlib/CPAN/Meta/Check.pm
@@ -1,5 +1,6 @@
 package CPAN::Meta::Check;
-$CPAN::Meta::Check::VERSION = '0.014';
+# vi:noet:sts=2:sw=2:ts=2
+$CPAN::Meta::Check::VERSION = '0.018';
 use strict;
 use warnings;
 
@@ -8,14 +9,14 @@ our @EXPORT = qw//;
 our @EXPORT_OK = qw/check_requirements requirements_for verify_dependencies/;
 our %EXPORT_TAGS = (all => [ @EXPORT, @EXPORT_OK ] );
 
-use CPAN::Meta::Prereqs '2.132830';
+use CPAN::Meta::Prereqs 2.132830;
 use CPAN::Meta::Requirements 2.121;
 use Module::Metadata 1.000023;
 
 sub _check_dep {
 	my ($reqs, $module, $dirs) = @_;
 
-	$module eq 'perl' and return ($reqs->accepts_module($module, $]) ? () : sprintf "Your Perl (%s) is not in the range '%s'", $], $reqs->requirements_for_module($module));
+	return $reqs->accepts_module($module, $]) ? () : sprintf "Your Perl (%s) is not in the range '%s'", $], $reqs->requirements_for_module($module) if $module eq 'perl';
 
 	my $metadata = Module::Metadata->new_from_module($module, inc => $dirs);
 	return "Module '$module' is not installed" if not defined $metadata;
@@ -80,7 +81,7 @@ CPAN::Meta::Check - Verify requirements in a CPAN::Meta object
 
 =head1 VERSION
 
-version 0.014
+version 0.018
 
 =head1 SYNOPSIS
 
@@ -114,8 +115,6 @@ This function returns a unified L<CPAN::Meta::Requirements|CPAN::Meta::Requireme
 
 =item * L<CPAN::Meta|CPAN::Meta>
 
-=for comment # vi:noet:sts=2:sw=2:ts=2
-
 =back
 
 =head1 AUTHOR