From d0369ddaf9126b8054338fea795641a6669d7cf1 Mon Sep 17 00:00:00 2001
From: Robert de Bock <robert@meinit.nl>
Date: Wed, 26 Jan 2022 12:55:01 +0100
Subject: [PATCH] Switch to Ansible 4 and 5, drop ansible-later, update action
 version.

---
 files/later.yml                  | 12 ------------
 generate.yml                     |  2 --
 templates/molecule-action.yml.j2 |  4 ++--
 templates/molecule.yml.j2        |  1 -
 templates/tox.ini.j2             |  9 ++++-----
 5 files changed, 6 insertions(+), 22 deletions(-)
 delete mode 100644 files/later.yml

diff --git a/files/later.yml b/files/later.yml
deleted file mode 100644
index 83b9158..0000000
--- a/files/later.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-rules:
-  version: "0.2"
-  exclude_files:
-    - meta/argument_specs.yml
-    - meta/exception.yml
-    - meta/preferences.yml
-    - meta/version.yml
-    - requirements.txt
-  exclude_filter:
-    - LINT0009
-    - ANSIBLE0007
diff --git a/generate.yml b/generate.yml
index bfadae4..0e88e2e 100755
--- a/generate.yml
+++ b/generate.yml
@@ -147,8 +147,6 @@
           dest: .github/FUNDING.yml
         - source: pre-commit-config.yaml
           dest: .pre-commit-config.yaml
-        - source: later.yml
-          dest: .later.yml
       loop_control:
         label: "{{ item.source }}"
 
diff --git a/templates/molecule-action.yml.j2 b/templates/molecule-action.yml.j2
index 570003e..cf45e3f 100644
--- a/templates/molecule-action.yml.j2
+++ b/templates/molecule-action.yml.j2
@@ -21,7 +21,7 @@ jobs:
           path: {% raw %}"${{ github.repository }}"{% endraw %}
 
       - name: molecule
-        uses: robertdebock/molecule-action@4.0.5
+        uses: robertdebock/molecule-action@4.0.6
         with:
           command: lint
   test:
@@ -51,7 +51,7 @@ jobs:
       - name: parse apparmor for mysql
         run: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
       - name: molecule
-        uses: robertdebock/molecule-action@4.0.5
+        uses: robertdebock/molecule-action@4.0.6
         with:
           image: {% raw %}${{ matrix.config.image }}{% endraw %}
 
diff --git a/templates/molecule.yml.j2 b/templates/molecule.yml.j2
index ef392da..4128689 100644
--- a/templates/molecule.yml.j2
+++ b/templates/molecule.yml.j2
@@ -9,7 +9,6 @@ lint: |
   set -e
   yamllint .
   ansible-lint
-  ansible-later
 driver:
   name: docker
 platforms:
diff --git a/templates/tox.ini.j2 b/templates/tox.ini.j2
index ec36087..631cebb 100644
--- a/templates/tox.ini.j2
+++ b/templates/tox.ini.j2
@@ -4,18 +4,17 @@ minversion = 3.21.4
 {% if tox_versions is defined %}
 envlist = py{310}-ansible-{% raw %}{{% endraw %}{% for version in tox_versions %}{{ version }}{% if not loop.last %},{% endif %}{% endfor %}{% raw %}}{% endraw %}
 {% else %}
-envlist = py{310}-ansible-{2.10,2.11,2.12}
+envlist = py{310}-ansible-{4,5}
 {% endif %}
 
 skipsdist = true
 
 [testenv]
 deps =
-    2.10: ansible-base == 2.10.*
-    2.11: ansible-core == 2.11.*
-    2.12: ansible-core == 2.12.*
+    4: ansible == 4.*
+    5: ansible == 5.*
     molecule[docker]
-    docker == 4.*
+    docker == 5.*
     ansible-lint == 5.*
 commands = molecule test
 setenv =