From d1ee3b61f905fbec74e46d7feceb91ace479aad1 Mon Sep 17 00:00:00 2001
From: Dmitriy Safronov <zimniy@cyberbrain.pw>
Date: Tue, 12 Nov 2024 14:41:15 +0400
Subject: [PATCH] refactor: update workflows & update.sh
Signed-off-by: Dmitriy Safronov <zimniy@cyberbrain.pw>
---
.github/workflows/lint.yaml | 5 +++--
.requirements/10.txt | 3 +++
.requirements/9.txt | 2 +-
.requirements/latest.txt | 3 ---
update.sh | 18 ++++++++----------
5 files changed, 15 insertions(+), 16 deletions(-)
create mode 100644 .requirements/10.txt
delete mode 100644 .requirements/latest.txt
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 9267c72..3d81f5a 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -24,7 +24,8 @@ jobs:
strategy:
max-parallel: 2
matrix:
- ansible: ["9", "latest"]
+ ansible: ["9", "10"]
+ python: ["3.10", "3.12"]
steps:
- name: Check out the codebase
@@ -33,7 +34,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v5
with:
- python-version: "3.10"
+ python-version: "${{ matrix.python }}"
cache: "pip"
cache-dependency-path: .requirements/${{ matrix.ansible }}.txt
diff --git a/.requirements/10.txt b/.requirements/10.txt
new file mode 100644
index 0000000..328d34a
--- /dev/null
+++ b/.requirements/10.txt
@@ -0,0 +1,3 @@
+# Requirements for ansible 10
+ansible >=10, <11
+ansible-lint
diff --git a/.requirements/9.txt b/.requirements/9.txt
index 893a015..d3e011d 100644
--- a/.requirements/9.txt
+++ b/.requirements/9.txt
@@ -1,3 +1,3 @@
-# Requirements for ansible stable
+# Requirements for ansible 9
ansible >=9, <10
ansible-lint
diff --git a/.requirements/latest.txt b/.requirements/latest.txt
deleted file mode 100644
index 9184e41..0000000
--- a/.requirements/latest.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# Requirements for ansible latest
-ansible
-ansible-lint
diff --git a/update.sh b/update.sh
index 439b374..686e61c 100755
--- a/update.sh
+++ b/update.sh
@@ -5,15 +5,13 @@ git \
https://github.com/dmitriysafronov/ansible_role-template.git \
.update
-rsync -av \
- --include=.github/ \
- --include=.github/workflows/ \
- --include=.github/workflows/lint.yaml \
- --include=.requirements/* \
- --include=update.sh \
- --exclude=* \
- --delete-after \
- .update/ \
- ./
+if [[ -s .update/update.list ]]; then
+ rsync -av \
+ --include-from=.update/update.list \
+ --exclude=* \
+ --delete-after \
+ .update/ \
+ ./
+fi
rm -rf .update/
--
GitLab