Skip to content

Commit

Permalink
Use gtar on OS/X for distributions
Browse files Browse the repository at this point in the history
  • Loading branch information
nigelhorne committed Sep 27, 2024
1 parent 5ddb130 commit 5e7818e
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 46 deletions.
11 changes: 10 additions & 1 deletion Makefile.PL
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,15 @@ if($online_tests) {
unlink('t/online.enabled');
}

my $dist = {
COMPRESS => 'gzip -9f',
SUFFIX => 'gz'
};

if($^O eq 'darwin') {
$dist->{'TAR'} = 'gtar';
}

WriteMakefile(
NAME => 'Geo::Coder::Abbreviations',
AUTHOR => q{Nigel Horne <njh@bandsman.co.uk>},
Expand All @@ -48,7 +57,7 @@ WriteMakefile(
'JSON::MaybeXS' => 0,
'LWP::Simple::WithCache' => 0,
'LWP::Protocol::https' => 0,
}, dist => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
}, dist => $dist,
clean => { FILES => 'Geo-Coder-Abbreviations-*' },
META_MERGE => {
'meta-spec' => { version => 2 },
Expand Down
13 changes: 4 additions & 9 deletions t/eof.t
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,10 @@

use strict;
use warnings;
use Test::DescribeMe qw(author);

Check failure on line 5 in t/eof.t

View workflow job for this annotation

GitHub Actions / Perl 5.30 on ubuntu-latest

Can't locate Test/DescribeMe.pm in @inc (you may need to install the Test::DescribeMe module) (@inc contains: /home/runner/work/Geo-Coder-Abbreviations/Geo-Coder-Abbreviations/lib /home/runner/work/Geo-Coder-Abbreviations/Geo-Coder-Abbreviations/local/lib/perl5 /home/runner/work/Geo-Coder-Abbreviations/Geo-Coder-Abbreviations/local/lib/perl5/x86_64-linux /home/runner/work/_actions/shogo82148/actions-setup-perl/v1/scripts/lib /home/runner/work/_actions/shogo82148/actions-setup-perl/v1/scripts/lib/perl5 /opt/hostedtoolcache/perl/5.30.3/x64/lib/site_perl/5.30.3/x86_64-linux /opt/hostedtoolcache/perl/5.30.3/x64/lib/site_perl/5.30.3 /opt/hostedtoolcache/perl/5.30.3/x64/lib/5.30.3/x86_64-linux /opt/hostedtoolcache/perl/5.30.3/x64/lib/5.30.3)

Check failure on line 5 in t/eof.t

View workflow job for this annotation

GitHub Actions / Perl 5.30 on ubuntu-latest

BEGIN failed--compilation aborted
use Test::Needs 'Test::EOF';
use Test::Most;

BEGIN {
if($ENV{'AUTHOR_TESTING'}) {
Test::EOF->import();
all_perl_files_ok({ minimum_newlines => 1, maximum_newlines => 4 });
done_testing();
} else {
plan(skip_all => 'Author tests not required for installation');
}
}
Test::EOF->import();
all_perl_files_ok({ minimum_newlines => 1, maximum_newlines => 4 });
done_testing();
11 changes: 3 additions & 8 deletions t/eol.t
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,9 @@

use strict;
use warnings;
use Test::DescribeMe qw(author);

Check failure on line 5 in t/eol.t

View workflow job for this annotation

GitHub Actions / Perl 5.30 on ubuntu-latest

Can't locate Test/DescribeMe.pm in @inc (you may need to install the Test::DescribeMe module) (@inc contains: /home/runner/work/Geo-Coder-Abbreviations/Geo-Coder-Abbreviations/lib /home/runner/work/Geo-Coder-Abbreviations/Geo-Coder-Abbreviations/local/lib/perl5 /home/runner/work/Geo-Coder-Abbreviations/Geo-Coder-Abbreviations/local/lib/perl5/x86_64-linux /home/runner/work/_actions/shogo82148/actions-setup-perl/v1/scripts/lib /home/runner/work/_actions/shogo82148/actions-setup-perl/v1/scripts/lib/perl5 /opt/hostedtoolcache/perl/5.30.3/x64/lib/site_perl/5.30.3/x86_64-linux /opt/hostedtoolcache/perl/5.30.3/x64/lib/site_perl/5.30.3 /opt/hostedtoolcache/perl/5.30.3/x64/lib/5.30.3/x86_64-linux /opt/hostedtoolcache/perl/5.30.3/x64/lib/5.30.3)

Check failure on line 5 in t/eol.t

View workflow job for this annotation

GitHub Actions / Perl 5.30 on ubuntu-latest

BEGIN failed--compilation aborted
use Test::Needs 'Test::EOL';
use Test::Most;

BEGIN {
if($ENV{'AUTHOR_TESTING'}) {
Test::EOL->import();
all_perl_files_ok({ trailing_whitespace => 1 });
} else {
plan(skip_all => 'Author tests not required for installation');
}
}
Test::EOL->import();
all_perl_files_ok({ trailing_whitespace => 1 });
2 changes: 1 addition & 1 deletion t/metrics.t
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!perl -wT
#!perl -w

use strict;
use warnings;
Expand Down
2 changes: 1 addition & 1 deletion t/no404s.t
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!perl -wT
#!perl -w

use strict;
use warnings;
Expand Down
16 changes: 5 additions & 11 deletions t/strict.t
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,10 @@
use strict;
use warnings;

use Test::DescribeMe qw(author);

Check failure on line 6 in t/strict.t

View workflow job for this annotation

GitHub Actions / Perl 5.30 on ubuntu-latest

Can't locate Test/DescribeMe.pm in @inc (you may need to install the Test::DescribeMe module) (@inc contains: /home/runner/work/Geo-Coder-Abbreviations/Geo-Coder-Abbreviations/lib /home/runner/work/Geo-Coder-Abbreviations/Geo-Coder-Abbreviations/local/lib/perl5 /home/runner/work/Geo-Coder-Abbreviations/Geo-Coder-Abbreviations/local/lib/perl5/x86_64-linux /home/runner/work/_actions/shogo82148/actions-setup-perl/v1/scripts/lib /home/runner/work/_actions/shogo82148/actions-setup-perl/v1/scripts/lib/perl5 /opt/hostedtoolcache/perl/5.30.3/x64/lib/site_perl/5.30.3/x86_64-linux /opt/hostedtoolcache/perl/5.30.3/x64/lib/site_perl/5.30.3 /opt/hostedtoolcache/perl/5.30.3/x64/lib/5.30.3/x86_64-linux /opt/hostedtoolcache/perl/5.30.3/x64/lib/5.30.3)

Check failure on line 6 in t/strict.t

View workflow job for this annotation

GitHub Actions / Perl 5.30 on ubuntu-latest

BEGIN failed--compilation aborted
use Test::Most;
use Test::Needs 'Test::Strict';

unless($ENV{AUTHOR_TESTING}) {
plan(skip_all => 'Author tests not required for installation');
}

eval 'use Test::Strict';
if($@) {
plan(skip_all => 'Test::Strict required for testing use strict');
} else {
all_perl_files_ok();
warnings_ok('lib/Geo/Coder/Abbreviations.pm');
}
Test::Strict->import();
all_perl_files_ok();
warnings_ok('lib/Geo/Coder/Abbreviations.pm');
9 changes: 3 additions & 6 deletions t/vars.t
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,9 @@
use strict;
use warnings;

use Test::DescribeMe qw(author);

Check failure on line 6 in t/vars.t

View workflow job for this annotation

GitHub Actions / Perl 5.30 on ubuntu-latest

Can't locate Test/DescribeMe.pm in @inc (you may need to install the Test::DescribeMe module) (@inc contains: /home/runner/work/Geo-Coder-Abbreviations/Geo-Coder-Abbreviations/lib /home/runner/work/Geo-Coder-Abbreviations/Geo-Coder-Abbreviations/local/lib/perl5 /home/runner/work/Geo-Coder-Abbreviations/Geo-Coder-Abbreviations/local/lib/perl5/x86_64-linux /home/runner/work/_actions/shogo82148/actions-setup-perl/v1/scripts/lib /home/runner/work/_actions/shogo82148/actions-setup-perl/v1/scripts/lib/perl5 /opt/hostedtoolcache/perl/5.30.3/x64/lib/site_perl/5.30.3/x86_64-linux /opt/hostedtoolcache/perl/5.30.3/x64/lib/site_perl/5.30.3 /opt/hostedtoolcache/perl/5.30.3/x64/lib/5.30.3/x86_64-linux /opt/hostedtoolcache/perl/5.30.3/x64/lib/5.30.3)

Check failure on line 6 in t/vars.t

View workflow job for this annotation

GitHub Actions / Perl 5.30 on ubuntu-latest

BEGIN failed--compilation aborted
use Test::Most;
use Test::Needs 'Test::Vars';

if($ENV{'AUTHOR_TESTING'}) {
Test::Vars->import();
all_vars_ok(ignore_vars => { '$self' => 0 });
} else {
plan(skip_all => 'Author tests not required for installation');
}
Test::Vars->import();
all_vars_ok(ignore_vars => { '$self' => 0 });
13 changes: 4 additions & 9 deletions t/version.t
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,10 @@

use strict;
use warnings;
use Test::DescribeMe qw(author);

Check failure on line 5 in t/version.t

View workflow job for this annotation

GitHub Actions / Perl 5.30 on ubuntu-latest

Can't locate Test/DescribeMe.pm in @inc (you may need to install the Test::DescribeMe module) (@inc contains: /home/runner/work/Geo-Coder-Abbreviations/Geo-Coder-Abbreviations/lib /home/runner/work/Geo-Coder-Abbreviations/Geo-Coder-Abbreviations/local/lib/perl5 /home/runner/work/Geo-Coder-Abbreviations/Geo-Coder-Abbreviations/local/lib/perl5/x86_64-linux /home/runner/work/_actions/shogo82148/actions-setup-perl/v1/scripts/lib /home/runner/work/_actions/shogo82148/actions-setup-perl/v1/scripts/lib/perl5 /opt/hostedtoolcache/perl/5.30.3/x64/lib/site_perl/5.30.3/x86_64-linux /opt/hostedtoolcache/perl/5.30.3/x64/lib/site_perl/5.30.3 /opt/hostedtoolcache/perl/5.30.3/x64/lib/5.30.3/x86_64-linux /opt/hostedtoolcache/perl/5.30.3/x64/lib/5.30.3)

Check failure on line 5 in t/version.t

View workflow job for this annotation

GitHub Actions / Perl 5.30 on ubuntu-latest

BEGIN failed--compilation aborted
use Test::Needs 'Test::Version';
use Test::Most;

BEGIN {
if($ENV{'AUTHOR_TESTING'}) {
Test::Version->import();
version_all_ok();
done_testing();
} else {
plan(skip_all => 'Author tests not required for installation');
}
}
Test::Version->import();
version_all_ok();
done_testing();

0 comments on commit 5e7818e

Please sign in to comment.