From 0b5f2ec77d1581ffa0ee1f369b7a339f1078b346 Mon Sep 17 00:00:00 2001
From: L3D <l3d@c3woc.de>
Date: Mon, 23 Oct 2023 00:58:17 +0200
Subject: [PATCH 1/2] Update linting

---
 .github/ansible-linting-check.yml           | 23 ---------------------
 .github/workflows/ansible-linting-check.yml |  7 +++----
 .github/workflows/galaxy.yml                | 20 ++++++++++--------
 .github/workflows/j2lint-check.yml          | 22 ++++++++++++++++++++
 .github/workflows/yamllint-check.yml        | 22 ++++++++++++++++++++
 .github/workflows/yamllint.yml              | 23 ---------------------
 6 files changed, 58 insertions(+), 59 deletions(-)
 delete mode 100644 .github/ansible-linting-check.yml
 create mode 100644 .github/workflows/j2lint-check.yml
 create mode 100644 .github/workflows/yamllint-check.yml
 delete mode 100644 .github/workflows/yamllint.yml

diff --git a/.github/ansible-linting-check.yml b/.github/ansible-linting-check.yml
deleted file mode 100644
index f17f24d..0000000
--- a/.github/ansible-linting-check.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-name: Ansible Lint check
-
-# yamllint disable-line rule:truthy
-on: [push, pull_request]
-
-jobs:
-  build:
-    name: Ansible Lint
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: 'checkout git repo'
-        uses: actions/checkout@v4.1.0
-        with:
-          lfs: true
-          submodules: true
-          fetch-depth: 0
-
-      - name: Run ansible-lint
-        uses: ansible-actions/ansible-lint-action@v0.0.2
-        with:
-          target: "./"
diff --git a/.github/workflows/ansible-linting-check.yml b/.github/workflows/ansible-linting-check.yml
index c3b37ed..3771a9b 100644
--- a/.github/workflows/ansible-linting-check.yml
+++ b/.github/workflows/ansible-linting-check.yml
@@ -10,14 +10,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: 'checkout git repo'
-        uses: actions/checkout@v4
+      - name: 'Checkout git repo'
+        uses: actions/checkout@v4.1.1
         with:
-          lfs: true
           submodules: true
           fetch-depth: 0
 
       - name: Run ansible-lint
-        uses: ansible-actions/ansible-lint-action@v0.0.2
+        uses: ansible-actions/ansible-lint-action@v1.0.1
         with:
           target: "./"
diff --git a/.github/workflows/galaxy.yml b/.github/workflows/galaxy.yml
index 4426496..f8beb99 100644
--- a/.github/workflows/galaxy.yml
+++ b/.github/workflows/galaxy.yml
@@ -1,22 +1,24 @@
 ---
-name: Galaxy release
+name: Galaxy-NG Roles Import
 
 # yamllint disable-line rule:truthy
 on:
-  push:
-    branches: ['main']
   release:
     types: ['created']
 
 jobs:
   build:
+    name: Galaxy Role Importer
     runs-on: ubuntu-latest
-    steps:
-      - name: 'checkout git repo'
-        uses: actions/checkout@v4
 
-      - name: 'release on galaxy'
-        uses: robertdebock/galaxy-action@1.2.1
+    steps:
+      - name: 'Checkout git repo'
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+          fetch-depth: 0
+
+      - name: 'Release on galaxy'
+        uses: ansible-actions/ansible-galaxy-action@v1.0.1
         with:
           galaxy_api_key: ${{ secrets.galaxy_api_key }}
-          git_branch: 'main'
diff --git a/.github/workflows/j2lint-check.yml b/.github/workflows/j2lint-check.yml
new file mode 100644
index 0000000..3f74620
--- /dev/null
+++ b/.github/workflows/j2lint-check.yml
@@ -0,0 +1,22 @@
+---
+name: Jinja2 Linting check
+
+# yamllint disable-line rule:truthy
+on: [push, pull_request]
+
+jobs:
+  build:
+    name: Jinja2 Linting
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: 'Checkout git repo'
+        uses: actions/checkout@v4.1.1
+        with:
+          submodules: true
+          fetch-depth: 0
+
+      - name: Run j2lint
+        uses: ansible-actions/j2lint-action@v0.0.1
+        with:
+          target: "./"
diff --git a/.github/workflows/yamllint-check.yml b/.github/workflows/yamllint-check.yml
new file mode 100644
index 0000000..48d9af2
--- /dev/null
+++ b/.github/workflows/yamllint-check.yml
@@ -0,0 +1,22 @@
+---
+name: Yamllint check
+
+# yamllint disable-line rule:truthy
+on: [push, pull_request]
+
+jobs:
+  build:
+    name: Yamllint
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: 'Checkout git repo'
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+          fetch-depth: 0
+
+      - name: Run yamllint
+        uses: ansible-actions/yamllint-action@v0.0.1
+        with:
+          target: "./"
diff --git a/.github/workflows/yamllint.yml b/.github/workflows/yamllint.yml
deleted file mode 100644
index 99bb4c4..0000000
--- a/.github/workflows/yamllint.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-name: 'Yamllint GitHub Actions'
-
-# yamllint disable-line rule:truthy
-on:
-  push:
-    branches: '*'
-  pull_request:
-    branches: '*'
-
-jobs:
-  yamllint:
-    name: 'Yamllint'
-    runs-on: ubuntu-latest
-    steps:
-      - name: 'checkout git repo'
-        uses: actions/checkout@v4
-
-      - name: 'Yamllint'
-        uses: karancode/yamllint-github-action@v2.1.1
-        with:
-          yamllint_file_or_dir: '.'
-          yamllint_config_filepath: './.yamllint'

From 536822693f5c72a84e17053f3672457fad6e2a12 Mon Sep 17 00:00:00 2001
From: L3D <l3d@c3woc.de>
Date: Mon, 23 Oct 2023 01:01:59 +0200
Subject: [PATCH 2/2] lineend

---
 .github/workflows/ansible-linting-check.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ansible-linting-check.yml b/.github/workflows/ansible-linting-check.yml
index 1eebcc9..3771a9b 100644
--- a/.github/workflows/ansible-linting-check.yml
+++ b/.github/workflows/ansible-linting-check.yml
@@ -19,4 +19,4 @@ jobs:
       - name: Run ansible-lint
         uses: ansible-actions/ansible-lint-action@v1.0.1
         with:
-          target: "./"
\ No newline at end of file
+          target: "./"