From c3623de253078406ce9f0ddd7319783f28365f56 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Fri, 28 Jun 2024 09:34:44 +0200 Subject: [PATCH] Make sure 3.9.0 is tested in CI and mentioned in README; fix RPM URLs again (#188) * Make sure 3.9.0 is tested in CI and mentioned in README. * Fix RPM URL for 3.9.0 release. --- .github/workflows/ansible-test.yml | 3 ++- README.md | 2 +- changelogs/fragments/188-sops-3.9.0.yml | 2 ++ roles/install/vars/OS-RedHat.yml | 5 ++++- 4 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 changelogs/fragments/188-sops-3.9.0.yml diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index d4d5533..1351945 100644 --- a/.github/workflows/ansible-test.yml +++ b/.github/workflows/ansible-test.yml @@ -80,6 +80,7 @@ jobs: - 3.7.3 - 3.8.0 - 3.8.1 + - 3.9.0 python_version: - '' include: @@ -124,7 +125,7 @@ jobs: sops_version: 3.8.1 - ansible: stable-2.17 docker_container: fedora39 - sops_version: 3.8.1 + sops_version: 3.9.0 # devel - ansible: devel docker_container: quay.io/ansible-community/test-image:archlinux diff --git a/README.md b/README.md index a3cd6ef..b137c71 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ The following table shows which versions of sops were tested with which versions |---|---| |0.1.0|`3.5.0+`| |1.0.6|`3.5.0+`| -|`main` branch|`3.5.0`, `3.6.0`, `3.7.3`, `3.8.0`| +|`main` branch|`3.5.0`, `3.6.0`, `3.7.3`, `3.8.0`, `3.8.1`, `3.9.0`| ## Tested with Ansible diff --git a/changelogs/fragments/188-sops-3.9.0.yml b/changelogs/fragments/188-sops-3.9.0.yml new file mode 100644 index 0000000..adca0a9 --- /dev/null +++ b/changelogs/fragments/188-sops-3.9.0.yml @@ -0,0 +1,2 @@ +bugfixes: + - "Fix RPM URL for the 3.9.0 release (https://github.com/ansible-collections/community.sops/pull/188)." diff --git a/roles/install/vars/OS-RedHat.yml b/roles/install/vars/OS-RedHat.yml index e06c628..0e7f213 100644 --- a/roles/install/vars/OS-RedHat.yml +++ b/roles/install/vars/OS-RedHat.yml @@ -24,7 +24,10 @@ _community_sops_install_system_packages_unsigned_github: }}{{ _community_sops_install_effective_sops_version.replace('-', '.') }}{{ - (_community_sops_install_effective_sops_version is version('3.8.0', '<')) | ternary('-1', '') + ( + _community_sops_install_effective_sops_version is version('3.8.0', '<') or + _community_sops_install_effective_sops_version is version('3.9.0', '>=') + ) | ternary('-1', '') }}.{{ ansible_facts.architecture }}.rpm