From eacc31220b7d9f2dce4f6ef83deeb2a596c0a2b9 Mon Sep 17 00:00:00 2001 From: Charles McGarvey Date: Fri, 25 Nov 2016 19:37:52 -0700 Subject: [PATCH] WIP: switch from TravisYML to TravisCI --- .travis.yml | 39 ++++++++++------------- cpanfile | 2 +- lib/Dist/Zilla/PluginBundle/Author/CCM.pm | 10 +++--- 3 files changed, 24 insertions(+), 27 deletions(-) diff --git a/.travis.yml b/.travis.yml index 86a7da9..315e919 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,25 +1,20 @@ -sudo: false -language: perl -perl: - - 'blead' - - '5.20' - - '5.18' - - '5.16' - - '5.14' - - '5.12' - - '5.10' - - '5.8' -matrix: - allow_failures: - - perl: 'blead' - - perl: '5.8' - fast_finish: true +--- before_install: - - git config --global user.name "TravisCI" - - git config --global user.email $HOSTNAME":not-for-mail@travis-ci.org" + - export HARNESS_OPTIONS=j10:c HARNESS_TIMER=1 + - rm .travis.yml + - git config --global user.name "Dist Zilla Plugin TravisCI" + - git config --global user.email $HOSTNAME":not-for-mail@travis-ci.org" install: - - cpanm --quiet --notest --skip-satisfied Dist::Zilla - - "dzil authordeps --missing | grep -vP '[^\\w:]' | xargs -n 5 -P 10 cpanm --quiet --notest" - - "dzil listdeps --author --missing | grep -vP '[^\\w:]' | cpanm --verbose" + - cpanm --quiet --notest --skip-installed Dist::Zilla + - dzil authordeps | grep -ve '^\W' | xargs -n 5 -P 10 cpanm --quiet --notest --skip-installed + - dzil listdeps | grep -ve '^\W' | cpanm --quiet --notest --skip-installed +language: perl +perl: + - '5.24' + - '5.22' + - '5.20' + - '5.18' + - '5.16' + - '5.14' script: - - dzil smoke --release --author + - dzil smoke --release --author diff --git a/cpanfile b/cpanfile index 07d5866..6f6316d 100644 --- a/cpanfile +++ b/cpanfile @@ -53,7 +53,7 @@ requires 'Dist::Zilla::Plugin::Test::Pod::No404s'; requires 'Dist::Zilla::Plugin::Test::Portability'; requires 'Dist::Zilla::Plugin::Test::ReportPrereqs'; requires 'Dist::Zilla::Plugin::TestRelease'; -requires 'Dist::Zilla::Plugin::TravisYML'; +requires 'Dist::Zilla::Plugin::TravisCI'; requires 'Dist::Zilla::Plugin::UploadToCPAN'; requires 'Pod::Elemental::Transformer::List'; requires 'Pod::Elemental::Transformer::Verbatim'; diff --git a/lib/Dist/Zilla/PluginBundle/Author/CCM.pm b/lib/Dist/Zilla/PluginBundle/Author/CCM.pm index a64c1a5..85adfac 100644 --- a/lib/Dist/Zilla/PluginBundle/Author/CCM.pm +++ b/lib/Dist/Zilla/PluginBundle/Author/CCM.pm @@ -82,7 +82,7 @@ You probably don't want to use this. filename = README location = build type = text - [TravisYML] + [TravisCI] TODO [Manifest] [ManifestSkip] @@ -200,7 +200,8 @@ sub configure { my @network_plugins = qw(Git::Push Test::Pod::No404s UploadToCPAN); my @gather_exclude = (@copy_from_build, qw(README.md)); my @gather_prune = qw(dist.ini); - my @no_index = qw(eg share shares t xt); + my @gather_noprune = qw(.travis.yml); + my @no_index = qw(eg share shares t xt .travis.yml); my @allow_dirty = (@copy_from_build, qw(.travis.yml Changes LICENSE README.md)); my @git_remotes = qw(github origin); my @check_files = qw(:InstallModules :ExecFiles :TestFiles :ExtraTestFiles); @@ -214,7 +215,7 @@ sub configure { # GATHER ['Git::GatherDir' => {exclude_filename => [@gather_exclude]}], - ['PruneCruft'], + ['PruneCruft' => {except => [@gather_noprune]}], ['PruneFiles' => {filename => [@gather_prune]}], ['CopyFilesFromBuild' => {copy => [@copy_from_build]}], @@ -257,7 +258,8 @@ sub configure { ['License'], ['ReadmeAnyFromPod' => 'repo readme' => {filename => 'README.md', location => 'root', type => 'markdown', phase => 'release'}], ['ReadmeAnyFromPod' => 'dist readme' => {filename => 'README', location => 'build', type => 'text'}], - ['TravisYML'], + ['TravisCI' => 'repo travis' => {perl_version => [qw(5.24 5.22 5.20 5.18 5.16 5.14)]}], + ['TravisCI' => 'dist travis' => {write_to => 'build'}], ['Manifest'], ['ManifestSkip'], -- 2.43.0