From 1ffdd73f31b991d8c6108900199ae2a96095c2d9 Mon Sep 17 00:00:00 2001 From: Alexander Gorelyshev Date: Sun, 28 Dec 2025 14:26:07 +0400 Subject: [PATCH 1/4] Drop obsolete code from CI --- .github/workflows/linters.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index 0aace81..99bf30f 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -13,7 +13,6 @@ jobs: steps: - uses: actions/checkout@v6 - - uses: mamba-org/setup-micromamba@4d84239119b14cba1690b971f05c0bab912bea04 with: micromamba-version: '2.4.0-0' @@ -22,14 +21,6 @@ jobs: post-cleanup: 'all' cache-environment: true - # - name: "Install role dependencies" - # run: ansible-galaxy install -r requirements.yml - # shell: micromamba-shell {0} - - - name: "Install community.general collection" - run: ansible-galaxy collection install community.general - shell: micromamba-shell {0} - - name: Check workflow files themselves with ActionLint run: actionlint shell: micromamba-shell {0} @@ -38,7 +29,7 @@ jobs: run: yamllint ci/*.yml shell: micromamba-shell {0} - - name: "Install collection dependencies" + - name: Install collection dependencies run: ansible-galaxy install -r requirements.yml shell: micromamba-shell {0} From afd6ff2fecde166b67e6838ab6d5fcd21eb481ad Mon Sep 17 00:00:00 2001 From: Alexander Gorelyshev Date: Sun, 28 Dec 2025 14:26:38 +0400 Subject: [PATCH 2/4] Pin all dependency versions --- ci/requirements.ci.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/requirements.ci.txt b/ci/requirements.ci.txt index f99c76a..af19bfd 100644 --- a/ci/requirements.ci.txt +++ b/ci/requirements.ci.txt @@ -1,6 +1,6 @@ -ansible-lint +ansible-lint==25.12.1 molecule==24.12.0 molecule-plugins[docker] docker~=7.1.0 requests==2.31.0 # pinned to the latest version not breaking Docker SDK -yamllint +yamllint==1.37.1 From d04639946f0117202c185fcd124a03473337107c Mon Sep 17 00:00:00 2001 From: Alexander Gorelyshev Date: Sun, 28 Dec 2025 14:27:04 +0400 Subject: [PATCH 3/4] Re-arrange the dependency list alphabetically --- requirements.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements.yml b/requirements.yml index ce80faa..5a3dc8a 100644 --- a/requirements.yml +++ b/requirements.yml @@ -1,10 +1,10 @@ --- collections: - name: ansible.posix + - name: community.crypto + - name: community.docker - name: community.general - name: community.grafana - - name: community.docker - - name: community.crypto - - name: maxhoesel.borgbackup - - name: lucasheld.uptime_kuma - name: community.postgresql + - name: lucasheld.uptime_kuma + - name: maxhoesel.borgbackup From 4ad970586c7fd7a975b9a7151d527febc491743a Mon Sep 17 00:00:00 2001 From: Alexander Gorelyshev Date: Sun, 28 Dec 2025 14:27:32 +0400 Subject: [PATCH 4/4] Indicate OS family in the task name for greater clarity --- roles/users/tasks/openssh.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/users/tasks/openssh.yml b/roles/users/tasks/openssh.yml index 753bf52..0bb602b 100644 --- a/roles/users/tasks/openssh.yml +++ b/roles/users/tasks/openssh.yml @@ -1,12 +1,12 @@ --- -- name: "OpenSSH | Ensure openssh client tools are installed" +- name: "OpenSSH | Ensure openssh client tools are installed (Debian)" when: ansible_os_family == "Debian" ansible.builtin.apt: name: openssh-client state: present cache_valid_time: 3000 -- name: "OpenSSH | Ensure openssh client tools are installed" +- name: "OpenSSH | Ensure openssh client tools are installed (RedHat)" when: ansible_os_family == "RedHat" ansible.builtin.dnf: name: openssh-clients