diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5f87e89..e41277f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,8 +42,6 @@ jobs: fail-fast: false matrix: include: - - distro: ubuntu1604 - ansible-version: '>=2.8, <2.9' - distro: ubuntu1604 ansible-version: '>=2.9, <2.10' - distro: ubuntu1604 diff --git a/meta/main.yml b/meta/main.yml index c2f0011..4a08739 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -7,7 +7,7 @@ galaxy_info: company: Oefenweb.nl B.V. description: Set up the latest version of R in Ubuntu systems license: MIT - min_ansible_version: 2.8.0 + min_ansible_version: 2.9.0 platforms: - name: Ubuntu versions: diff --git a/tasks/packages.yml b/tasks/packages.yml index baef509..483a0e3 100644 --- a/tasks/packages.yml +++ b/tasks/packages.yml @@ -41,10 +41,10 @@ - name: packages | install command: > {{ r_scripts_install_path }}/R-install-package - {{ item.name }} - {{ item.type | default(r_packages_type) }} - {{ item.lib | default(r_packages_lib) }} - {% if item.repos is defined %}{{ item.repos }}{% endif %} + {{ item.name }} + {{ item.type | default(r_packages_type) }} + {{ item.lib | default(r_packages_lib) }} + {% if item.repos is defined %}{{ item.repos }}{% endif %} environment: "{{ r_environment }}" register: _r_install_package changed_when: "_r_install_package.stdout_lines[-1] is defined and _r_install_package.stdout_lines[-1] == 'changed'" @@ -63,8 +63,8 @@ - name: packages | remove command: > {{ r_scripts_install_path }}/R-remove-package - {{ item.name }} - {% if item.lib is defined %}{{ item.lib }}{% endif %} + {{ item.name }} + {% if item.lib is defined %}{{ item.lib }}{% endif %} environment: "{{ r_environment }}" register: _r_remove_package changed_when: "_r_remove_package.stdout_lines[-1] is defined and _r_remove_package.stdout_lines[-1] == 'changed'" @@ -79,10 +79,10 @@ - name: packages | update command: > {{ r_scripts_install_path }}/R-update-package - {{ item.name }} - {{ item.type | default(r_packages_type) }} - {{ item.lib | default(r_packages_lib) }} - {% if item.repos is defined %}{{ item.repos }}{% endif %} + {{ item.name }} + {{ item.type | default(r_packages_type) }} + {{ item.lib | default(r_packages_lib) }} + {% if item.repos is defined %}{{ item.repos }}{% endif %} environment: "{{ r_environment }}" register: _r_update_package changed_when: "_r_update_package.stdout_lines[-1] is defined and _r_update_package.stdout_lines[-1] == 'changed'"