From 64ee45c4c9ea51ed9fa11c82054c0bb9aecfbdf9 Mon Sep 17 00:00:00 2001
From: Robert de Bock <robert@meinit.nl>
Date: Tue, 29 Mar 2022 10:24:06 +0200
Subject: [PATCH] New feature in action.

---
 README.md                        | 12 ------------
 generate.yml                     | 11 -----------
 templates/README.md.j2           | 10 ----------
 templates/ansible-lint.j2        |  5 +----
 templates/galaxy.yml.j2          |  2 +-
 templates/gitlab-ci.yml.j2       |  2 +-
 templates/molecule-action.yml.j2 |  4 ++--
 7 files changed, 5 insertions(+), 41 deletions(-)

diff --git a/README.md b/README.md
index eb1eddd..f13e60e 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,6 @@ This script loads input from:
 
 - meta/main.yml*
 - meta/version.yml
-- meta/exception.yml
 - meta/preferences.yml
 - defaults/main.yml
 - requirements.yml
@@ -83,17 +82,6 @@ versions:
     url: "https://github.com/ansible/ansible/releases"
 ```
 
-## meta/exception.yml
-
-This optional file describes why some build are excepted.
-
-```yaml
----
-exceptions:
-  - variation: alpine
-    reason: "Not idempotent"
-```
-
 ## meta/preferences.yml
 
 This optional file describes how Travis, Tox and Molecule should behave.
diff --git a/generate.yml b/generate.yml
index 0e88e2e..3a33015 100755
--- a/generate.yml
+++ b/generate.yml
@@ -32,17 +32,6 @@
       register: versionyml
       when:
         - versionymlstat.stat.exists | bool
-    - name: check meta/exception.yml
-      stat:
-        path: "{{ role_path }}/meta/exception.yml"
-      register: exceptionymlstat
-
-    - name: load meta/exception.yml
-      include_vars:
-        file: "{{ role_path }}/meta/exception.yml"
-      register: exceptionyml
-      when:
-        - exceptionymlstat.stat.exists | bool
 
     - name: check meta/preferences.yml
       stat:
diff --git a/templates/README.md.j2 b/templates/README.md.j2
index 66ba791..476dd44 100644
--- a/templates/README.md.j2
+++ b/templates/README.md.j2
@@ -76,16 +76,6 @@ The minimum version of Ansible required is {{ meta.galaxy_info.min_ansible_versi
 - The current version.
 - The development version.
 
-{% if exceptions is defined %}
-## [Exceptions](#exceptions)
-
-Some roles can't run on a specific distribution or version. Here are some exceptions.
-
-| variation                 | reason                 |
-|---------------------------|------------------------|
-{% for exception in exceptions %}| {{ exception.variation }} | {{ exception.reason }} |
-{% endfor %}{% endif %}
-
 {% if versions is defined %}
 ## [Included version(s)](#included-versions)
 
diff --git a/templates/ansible-lint.j2 b/templates/ansible-lint.j2
index ea4c1b3..5cc4f2d 100644
--- a/templates/ansible-lint.j2
+++ b/templates/ansible-lint.j2
@@ -1,13 +1,10 @@
 ---
 {{ ansible_managed | comment }}
-{% if versionymlstat.stat.exists or exceptionymlstat.stat.exists or preferencesymlstat.stat.exists or verify.stat.exists %}
+{% if versionymlstat.stat.exists or preferencesymlstat.stat.exists or verify.stat.exists %}
 exclude_paths:
 {% if versionymlstat.stat.exists %}
   - ./meta/version.yml
 {% endif %}
-{% if exceptionymlstat.stat.exists %}
-  - ./meta/exception.yml
-{% endif %}
 {% if preferencesymlstat.stat.exists %}
   - ./meta/preferences.yml
 {% endif %}
diff --git a/templates/galaxy.yml.j2 b/templates/galaxy.yml.j2
index 1fb67de..85269f4 100644
--- a/templates/galaxy.yml.j2
+++ b/templates/galaxy.yml.j2
@@ -11,6 +11,6 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: galaxy
-        uses: robertdebock/galaxy-action@1.1.0
+        uses: robertdebock/galaxy-action@1.2.0
         with:
           galaxy_api_key: {% raw %}${{ secrets.galaxy_api_key }}{% endraw %}
diff --git a/templates/gitlab-ci.yml.j2 b/templates/gitlab-ci.yml.j2
index f54d26c..2adb71c 100644
--- a/templates/gitlab-ci.yml.j2
+++ b/templates/gitlab-ci.yml.j2
@@ -1,5 +1,5 @@
 ---
-image: "robertdebock/github-action-molecule:4.0.5"
+image: "robertdebock/github-action-molecule:4.0.6"
 
 services:
   - docker:dind
diff --git a/templates/molecule-action.yml.j2 b/templates/molecule-action.yml.j2
index cf45e3f..463f8c4 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.6
+        uses: robertdebock/molecule-action@4.0.7
         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.6
+        uses: robertdebock/molecule-action@4.0.7
         with:
           image: {% raw %}${{ matrix.config.image }}{% endraw %}