Compare commits

..

No commits in common. "master" and "RELEASE_1.1.1" have entirely different histories.

7 changed files with 26 additions and 34 deletions

View file

@ -1,10 +0,0 @@
# Set update schedule for GitHub Actions
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
# Check for updates to GitHub Actions every week
interval: "weekly"

View file

@ -1,5 +1,9 @@
# This is a basic workflow to help you get started with Actions
name: CI name: CI
# Controls when the action will run. Triggers the workflow on push or pull request
# events but only for the master branch
on: on:
push: push:
branches: [ master ] branches: [ master ]
@ -7,15 +11,21 @@ on:
branches: [ master ] branches: [ master ]
workflow_dispatch: workflow_dispatch:
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs: jobs:
build: build:
uses: PerlToolsTeam/github_workflows/.github/workflows/cpan-test.yml@main runs-on: ${{ matrix.os }}
strategy:
coverage: matrix:
uses: PerlToolsTeam/github_workflows/.github/workflows/cpan-coverage.yml@main os: [ 'ubuntu-latest', 'macos-latest' ]
perl: [ 'latest' ]
perlcritic: name: Perl ${{ matrix.perl }} on ${{ matrix.os }}
uses: PerlToolsTeam/github_workflows/.github/workflows/cpan-perlcritic.yml@main steps:
- uses: actions/checkout@v3
complexity: - name: Set up perl
uses: PerlToolsTeam/github_workflows/.github/workflows/cpan-complexity.yml@main uses: shogo82148/actions-setup-perl@v1
with:
perl-version: ${{ matrix.perl }}
- run: perl -V
- run: cpanm --installdeps .
- run: prove -lv t

View file

@ -23,11 +23,11 @@ my $build = Module::Build->new(
resources => { resources => {
repository => { repository => {
type => 'git', type => 'git',
url => 'git://github.com/davorg-cpan/parse-rpm-spec.git', url => 'git://github.com/davorg/parse-rpm-spec.git',
web => 'https://github.com/davorg-cpan/parse-rpm-spec', web => 'https://github.com/davorg/parse-rpm-spec',
}, },
bugtracker => { bugtracker => {
web => 'https://github.com/davorg-cpan/parse-rpm-spec/issues', web => 'https://github.com/davorg/parse-rpm-spec/issues',
}, },
}, },
}, },

View file

@ -1,8 +1,3 @@
2023-01-13 Dave Cross <dave@perlhacks.com>
* Version 1.1.2
* Fix name of excludearch method (thanks Michal Josef Špaček)
2023-01-12 Dave Cross <dave@perlhacks.com> 2023-01-12 Dave Cross <dave@perlhacks.com>
* Version 1.1.1 * Version 1.1.1

View file

@ -7,7 +7,7 @@ use warnings;
use Carp; use Carp;
use Moose; use Moose;
our $VERSION = 'v1.1.2'; our $VERSION = 'v1.1.1';
has file => ( is => 'ro', isa => 'Str', required => 1 ); has file => ( is => 'ro', isa => 'Str', required => 1 );
has name => ( is => 'rw', isa => 'Str' ); has name => ( is => 'rw', isa => 'Str' );
@ -23,7 +23,7 @@ has buildroot => ( is => 'rw', isa => 'Str' );
has buildarch => ( is => 'rw', isa => 'Str' ); has buildarch => ( is => 'rw', isa => 'Str' );
has buildrequires => ( is => 'rw', isa => 'ArrayRef[Str]', default => sub { [] } ); has buildrequires => ( is => 'rw', isa => 'ArrayRef[Str]', default => sub { [] } );
has requires => ( is => 'rw', isa => 'ArrayRef[Str]', default => sub { [] } ); has requires => ( is => 'rw', isa => 'ArrayRef[Str]', default => sub { [] } );
has [ qw( excludearch exclusivearch excludeos exclusiveos ) ] has [ qw( excluderach exclusivearch excludeos exclusiveos ) ]
=> ( is => 'rw', isa => 'Str' ); => ( is => 'rw', isa => 'Str' );
has parse_spec => ( has parse_spec => (
@ -42,7 +42,7 @@ sub _build_parse_spec {
summary => qr[^Summary:\s+(.+)], summary => qr[^Summary:\s+(.+)],
license => qr[^License:\s+(.+)], license => qr[^License:\s+(.+)],
group => qr[^Group:\s+(\S+)], group => qr[^Group:\s+(\S+)],
url => qr[^(?:URL|Url):\s+(\S+)], url => qr[^URL:\s+(\S+)],
buildroot => qr[^BuildRoot:\s+(\S+)], buildroot => qr[^BuildRoot:\s+(\S+)],
buildarch => qr[^BuildArch:\s+(\S+)], buildarch => qr[^BuildArch:\s+(\S+)],
excludearch => qr[^ExcludeArch:\s+(\S+)], excludearch => qr[^ExcludeArch:\s+(\S+)],

View file

@ -13,7 +13,6 @@ BuildRequires: perl >= 1:5.6.0
BuildRequires: perl(Module::Build) BuildRequires: perl(Module::Build)
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
ExclusiveArch: megaCPU ExclusiveArch: megaCPU
ExcludeArch: crapCPU
%description %description
If you have two arrays and you want to know if they are the same or If you have two arrays and you want to know if they are the same or

View file

@ -12,7 +12,6 @@ isa_ok($spec, 'Parse::RPM::Spec');
is($spec->name, 'perl-Array-Compare', 'Correct name'); is($spec->name, 'perl-Array-Compare', 'Correct name');
is($spec->summary, 'Perl extension for comparing arrays', 'Correct summary'); is($spec->summary, 'Perl extension for comparing arrays', 'Correct summary');
is($spec->url, 'http://search.cpan.org/dist/Array-Compare/', 'Correct URL');
is($spec->epoch, 1, 'Correct epoch'); is($spec->epoch, 1, 'Correct epoch');
is($spec->version, '1.16', 'Correct version'); is($spec->version, '1.16', 'Correct version');
@ -24,7 +23,6 @@ is($spec->buildrequires->[0], 'perl >= 1:5.6.0',
'First build requirement is correct'); 'First build requirement is correct');
is($spec->exclusivearch, 'megaCPU', 'Correct exclusive architecture'); is($spec->exclusivearch, 'megaCPU', 'Correct exclusive architecture');
is($spec->excludearch, 'crapCPU', 'Correct excluded architecture');
dies_ok { Parse::RPM::Spec->new } dies_ok { Parse::RPM::Spec->new }
'No spec file given'; 'No spec file given';