From d88e1cecca138798419cfa6c6134acc5ac9e2d02 Mon Sep 17 00:00:00 2001
From: "Jason A. Crome" <cpan@jason.cromedome.dev>
Date: Sun, 16 Jun 2024 11:43:39 -0400
Subject: [PATCH 1/2] Update tests for minimum, current Perl version

Minimum "supported" Perl version is 5.20 now, and we should always test
against the latest Perl version too (5.40, at the time of this writing).

Some older Perl images were incompatible with GitHub Actions, so using
release-specific images that are known to work.
---
 .github/workflows/ci.yml | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a43f1ae3a..7c36012de 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,9 +30,9 @@ jobs:
       fail-fast: false
       matrix:
         perl-version:
-          - '5.38'
-          - '5.32'
-          - '5.20'
+          - 'latest'
+          - '5.36-bookworm'
+          - '5.20-buster'
 
     container:
       image: perldocker/perl-tester:${{ matrix.perl-version }}     # https://hub.docker.com/r/perldocker/perl-tester
@@ -63,14 +63,14 @@ jobs:
             dzil test --author --release
 
       - name: Create release
-        if: ${{ matrix.perl-version == '5.38' }}
+        if: ${{ matrix.perl-version == 'latest' }}
         run: |
             # Increase the version number by 0.000001 so in the reports we can be sure we are using the code to be released.
             perl -i -p -e 's/^version\s*=\s*(\d+\.\d+)/"version = " . ($1 + 0.000001)/e' dist.ini
             dzil build
 
       - name: Archive artifacts
-        if: ${{ matrix.perl-version == '5.38' }}
+        if: ${{ matrix.perl-version == 'latest' }}
         uses: actions/upload-artifact@v2
         with:
           name: the-dancer
@@ -86,16 +86,17 @@ jobs:
       fail-fast: false
       matrix:
         perl-version:
-          - '5.38'
-          - "5.32"
-          - "5.14"
+          - 'latest'
+          - "5.36-bookworm"
+          - "5.20-buster"
 #          - "5.28"
 #          - "5.26"
 #          - "5.24"
 #          - "5.22"
-#          - "5.20"
+#- "5.20"
 #          - "5.18"
 #          - "5.16"
+#          - "5.14"
 
     container:
       image: perl:${{ matrix.perl-version }}
@@ -122,7 +123,7 @@ jobs:
       fail-fast: false
       matrix:
         perl-version:
-          - '5.38'
+          - 'latest'
 
     container:
       image: perldocker/perl-tester:${{ matrix.perl-version }}     # https://hub.docker.com/r/perldocker/perl-tester
@@ -166,7 +167,7 @@ jobs:
         # Will resolve and uncomment later.
         #runner: [ubuntu-latest, macos-latest, windows-latest]
         runner: [ubuntu-latest, macos-latest]
-        perl: [ '5.38' ]
+        perl: [ 'latest' ]
 
     runs-on: ${{matrix.runner}}
     name: Native on OS ${{matrix.runner}} Perl ${{matrix.perl}}

From 1b4a09e548fb95015df6fe00629a01bc4982099e Mon Sep 17 00:00:00 2001
From: "Jason A. Crome" <jason@crome-plated.com>
Date: Tue, 2 Jul 2024 20:41:22 -0400
Subject: [PATCH 2/2] Remove dzil license plugin so CI can run

Since we already have a license file, Dist::Zilla will die if it tries
to generate another. Disabling the license plugin keeps our license file
intact, allowing CI to run, and for GitHub to show a license tab to
users.
---
 dist.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dist.ini b/dist.ini
index 90ed97c57..33bdce603 100644
--- a/dist.ini
+++ b/dist.ini
@@ -28,6 +28,7 @@ add_files_in = README.md
 -remove = AutoPrereqs
 -remove = GithubMeta
 -remove = ModuleBuild
+-remove = License
 
 [DynamicPrereqs]
 ; GH#1332 if old HTTP::XSCookies is installed we need to upgrade