From 94ccbe1dfbaed70d562ed95820607d8756e2eb64 Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Wed, 21 Apr 2021 17:59:48 +0200 Subject: [PATCH] Update Ansible collections (#390) --- .github/workflows/molecule.yml | 4 ---- .github/workflows/requirements/requirements_ansible.yml | 4 ++-- CHANGELOG.md | 2 +- README.md | 2 +- tasks/opensource/install-source.yml | 2 +- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index e99a897..0e6eaaf 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -37,10 +37,6 @@ jobs: if: "!(contains(matrix.scenario, 'plus') && github.event.pull_request.head.repo.full_name != github.repository)" run: pip3 install -r .github/workflows/requirements/requirements_molecule.txt - - name: Uninstall Ansible community distribution (temporary) - if: "!(contains(matrix.scenario, 'plus') && github.event.pull_request.head.repo.full_name != github.repository)" - run: pip3 uninstall -y ansible - - name: Install Ansible base dependencies if: "!(contains(matrix.scenario, 'plus') && github.event.pull_request.head.repo.full_name != github.repository)" run: ansible-galaxy install -r .github/workflows/requirements/requirements_ansible.yml diff --git a/.github/workflows/requirements/requirements_ansible.yml b/.github/workflows/requirements/requirements_ansible.yml index 7b11d9b..33de69d 100644 --- a/.github/workflows/requirements/requirements_ansible.yml +++ b/.github/workflows/requirements/requirements_ansible.yml @@ -1,8 +1,8 @@ --- collections: - name: community.general - version: 2.3.0 + version: 2.5.1 - name: ansible.posix version: 1.2.0 - name: community.docker - version: 1.4.0 + version: 1.5.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 71a9c04..50934c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ FEATURES: --- collections: - name: community.general - version: 2.3.0 + version: 2.5.1 - name: ansible.posix version: 1.2.0 ``` diff --git a/README.md b/README.md index f31e9ab..bd0abb7 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ With the advent of Ansible collections and the release of the [NGINX Core Ansibl --- collections: - name: community.general - version: 2.3.0 + version: 2.5.1 - name: ansible.posix version: 1.2.0 ``` diff --git a/tasks/opensource/install-source.yml b/tasks/opensource/install-source.yml index af2cf8d..346ca41 100644 --- a/tasks/opensource/install-source.yml +++ b/tasks/opensource/install-source.yml @@ -297,7 +297,7 @@ - name: Set NGINX stable version 1/2 set_fact: - nginx_version: "{{ nginx_versions.content | regex_search('stable[^<]*') | regex_replace('stable', 'release') }}" + nginx_version: "{{ nginx_versions.content | regex_search('stable[^ ]*') | regex_replace('stable', 'release') }}" when: nginx_branch == "stable" - name: Set NGINX stable version 2/2