From f2fa475d8bd37e73ab844fe0abb20ac1ea1d825b Mon Sep 17 00:00:00 2001
From: Mark Mercado <mamercad@gmail.com>
Date: Sat, 3 Feb 2024 18:10:35 -0500
Subject: [PATCH] Add new and drop deprecated versions of ansible-core

---
 .github/workflows/ansible-test-sanity.yml     | 21 ++++++++++++-------
 .github/workflows/ansible-test-unit.yml       | 21 ++++++++++++-------
 README.md                                     |  2 +-
 .../fragments/351-ansible-core-versions.yml   |  2 ++
 tests/utils/render.sh                         |  2 ++
 5 files changed, 31 insertions(+), 17 deletions(-)
 create mode 100644 changelogs/fragments/351-ansible-core-versions.yml

diff --git a/.github/workflows/ansible-test-sanity.yml b/.github/workflows/ansible-test-sanity.yml
index 25df1247..bfd48fac 100644
--- a/.github/workflows/ansible-test-sanity.yml
+++ b/.github/workflows/ansible-test-sanity.yml
@@ -10,20 +10,25 @@ on:
 jobs:
   sanity:
     timeout-minutes: 30
-    name: Sanity (Ⓐ$${{ matrix.ansible }})
+    name: Sanity (Ⓐ$${{ matrix.versions.ansible }})
     strategy:
       fail-fast: false
       matrix:
-        ansible:
-          - stable-2.12
-          - stable-2.13
-          - stable-2.14
+        versions:
+          - ansible: stable-2.14
+            python: "3.9"
+          - ansible: stable-2.15
+            python: "3.9"
+          - ansible: stable-2.16
+            python: "3.10"
+          - ansible: devel
+            python: "3.10"
     runs-on: ubuntu-22.04
     steps:
       - name: Perform testing
         uses: ansible-community/ansible-test-gh-action@release/v1
         with:
-          ansible-core-version: ${{ matrix.ansible }}
-          origin-python-version: 3.9
-          target-python-version: 3.9
+          ansible-core-version: ${{ matrix.versions.ansible }}
+          origin-python-version: ${{ matrix.versions.python }}
+          target-python-version: ${{ matrix.versions.python }}
           testing-type: sanity
diff --git a/.github/workflows/ansible-test-unit.yml b/.github/workflows/ansible-test-unit.yml
index 7639c7f0..86d92fa1 100644
--- a/.github/workflows/ansible-test-unit.yml
+++ b/.github/workflows/ansible-test-unit.yml
@@ -10,21 +10,26 @@ jobs:
   units:
     runs-on: ubuntu-22.04
     timeout-minutes: 30
-    name: Units (Ⓐ${{ matrix.ansible }})
+    name: Units (Ⓐ${{ matrix.versions.ansible }})
     strategy:
       fail-fast: false
       matrix:
-        ansible:
-          - stable-2.12
-          - stable-2.13
-          - stable-2.14
+        versions:
+          - ansible: stable-2.14
+            python: "3.9"
+          - ansible: stable-2.15
+            python: "3.9"
+          - ansible: stable-2.16
+            python: "3.10"
+          - ansible: devel
+            python: "3.10"
     steps:
       - name: Perform testing
         uses: ansible-community/ansible-test-gh-action@release/v1
         with:
-          ansible-core-version: ${{ matrix.ansible }}
-          origin-python-version: 3.9
-          target-python-version: 3.9
+          ansible-core-version: ${{ matrix.versions.ansible }}
+          origin-python-version: ${{ matrix.versions.python }}
+          target-python-version: ${{ matrix.versions.python }}
           testing-type: units
           test-deps: >-
             ansible.netcommon
diff --git a/README.md b/README.md
index dd41f07d..6ff0c144 100644
--- a/README.md
+++ b/README.md
@@ -73,7 +73,7 @@ This collection contains modules and plugins to assist in automating [DigitalOce
 
 The collection is tested and supported with:
 
-- ansible-core >= 2.12 (not including `devel`)
+- ansible-core >= 2.14 (including `devel`)
 - python >= 3.9
 
 ### Installing the Collection from Ansible Galaxy
diff --git a/changelogs/fragments/351-ansible-core-versions.yml b/changelogs/fragments/351-ansible-core-versions.yml
new file mode 100644
index 00000000..853c9e4f
--- /dev/null
+++ b/changelogs/fragments/351-ansible-core-versions.yml
@@ -0,0 +1,2 @@
+trivial:
+  - ci - add new and drop deprecated versions of ``ansible-core`` (https://github.com/ansible-collections/community.digitalocean/issues/351).
diff --git a/tests/utils/render.sh b/tests/utils/render.sh
index 5ffcf1be..dcf77751 100755
--- a/tests/utils/render.sh
+++ b/tests/utils/render.sh
@@ -8,7 +8,9 @@ set -u
 
 function main()
 {
+  # shellcheck disable=SC2155
   readonly template="$1"; shift
+  # shellcheck disable=SC2155
   readonly content="$(cat "$template")"
 
   eval "echo \"$content\""