X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fp5-Dist-Zilla-PluginBundle-Author-CCM;a=blobdiff_plain;f=lib%2FDist%2FZilla%2FPluginBundle%2FAuthor%2FCCM.pm;h=7a51fd85ad2a739cf453bca0e582264e54415bb4;hp=27b15b8a4c83cefee140297a9174c3efc064f573;hb=5081d19e826a72236ef02b36ee4f205c0d0cc308;hpb=b582f56359e9a5e87019876758b1df1ac561875d

diff --git a/lib/Dist/Zilla/PluginBundle/Author/CCM.pm b/lib/Dist/Zilla/PluginBundle/Author/CCM.pm
index 27b15b8..7a51fd8 100644
--- a/lib/Dist/Zilla/PluginBundle/Author/CCM.pm
+++ b/lib/Dist/Zilla/PluginBundle/Author/CCM.pm
@@ -13,7 +13,6 @@ You probably don't want to use this.
 
     ; VERSION
     [Git::NextVersion]
-    [NextRelease]
     [ReversionOnRelease]
     prompt              = 1
 
@@ -92,6 +91,7 @@ You probably don't want to use this.
     [MakeMaker]                 ; override with the "installer" attribute
 
     ; RELEASE
+    [NextRelease]
     [CheckChangesHasContent]
     [Git::Check]
     [RunExtraTests]
@@ -212,11 +212,31 @@ sub configure {
         say '[@Author::CCM] WARNING! WARNING! WARNING! *** You are in no_upload mode!! ***';
     }
 
+    if (!$self->payload->{'TravisYML.support_builddir'}) {
+        # swap perl_version and perl_version_build because DZP::TravisYML got it backwards!
+        # https://github.com/SineSwiper/Dist-Zilla-TravisCI/pull/40
+
+        my $tmp = $self->payload->{'TravisYML.perl_version_build'};
+        if (defined $self->payload->{'TravisYML.perl_version'}) {
+            $self->payload->{'TravisYML.perl_version_build'} = $self->payload->{'TravisYML.perl_version'}
+        }
+        else {
+            delete $self->payload->{'TravisYML.perl_version_build'};
+        }
+        if (defined $tmp) {
+            $self->payload->{'TravisYML.perl_version'} = $tmp;
+        }
+        else {
+            delete $self->payload->{'TravisYML.perl_version'};
+        }
+
+        ($perl_version, $perl_version_build) = ($perl_version_build, $perl_version);
+    }
+
     my @plugins = (
 
         # VERSION
         ['Git::NextVersion'],
-        ['NextRelease'],
         ['ReversionOnRelease' => {prompt => 1}],
 
         # GATHER
@@ -272,6 +292,7 @@ sub configure {
         $self->installer,     # e.g. MakeMaker
 
         # RELEASE
+        ['NextRelease'],
         ['CheckChangesHasContent'],
         ['Git::Check' => {allow_dirty => [@allow_dirty], untracked_files => 'ignore'}],
         ['RunExtraTests'],