Update Drupal role to latest version.

Author: geerlingguy

provisioning/requirements.yml

@@ -19,7 +19,7 @@ roles:
  - name: geerlingguy.daemonize
  version: 1.2.2
  - name: geerlingguy.drupal
- version: 4.2.0
+ version: 4.3.0
  - name: geerlingguy.drupal-console
  version: 1.1.1
  - name: geerlingguy.drush

provisioning/roles/geerlingguy.drupal/.ansible-lint

@@ -1,4 +1,4 @@
 skip_list:
- - '204'
- - '503'
- - '106'
+ - 'yaml'
+ - 'no-handler'
+ - 'role-name'

provisioning/roles/geerlingguy.drupal/.github/stale.yml

@@ -12,6 +12,7 @@ onlyLabels: []
 
 # Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
 exemptLabels:
+ - bug
  - pinned
  - security
  - planned

provisioning/roles/geerlingguy.drupal/.github/workflows/ci.yml

@@ -29,24 +29,25 @@ jobs:
  python-version: '3.x'
 
  - name: Install test dependencies.
- run: pip3 install yamllint ansible-lint
+ run: pip3 install yamllint
 
  - name: Lint code.
  run: |
  yamllint .
- ansible-lint
 
  molecule:
  name: Molecule
  runs-on: ubuntu-latest
  strategy:
  matrix:
  include:
- - distro: centos8
+ - distro: rockylinux8
  playbook: converge.yml
  - distro: ubuntu1804
  playbook: converge.yml
- - distro: centos8
+ # - distro: debian10
+ # playbook: converge.yml
+ - distro: rockylinux8
  playbook: deploy.yml
 
  steps:

provisioning/roles/geerlingguy.drupal/.gitignore

@@ -1,3 +1,5 @@
 *.retry
 */__pycache__
 *.pyc
+.cache
+

provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml

@@ -33,25 +33,13 @@
  become: false
  when: not drupal_site_exists
 
-# Use manual composer require tasks until Ansible 2.10.4 is released.
 - name: Install dependencies with composer require (this may take a while).
- command: "{{ composer_path }} require {{ item }} -d {{ drupal_composer_install_dir }}"
- register: composer_require_result
- changed_when: "'Nothing to install' not in composer_require_result.stderr"
- with_items: "{{ drupal_composer_dependencies|default([]) }}"
+ composer:
+ command: require
+ arguments: "{{ item }}"
+ working_dir: "{{ drupal_composer_install_dir }}"
+ with_items: "{{ drupal_composer_dependencies | default([]) }}"
  become: false
  environment:
  COMPOSER_PROCESS_TIMEOUT: 1200
  COMPOSER_MEMORY_LIMIT: '-1'
-
-# Switch back to this task after Ansible 2.10.4 is released.
-# - name: Install dependencies with composer require (this may take a while).
-# composer:
-# command: require
-# arguments: "{{ item }}"
-# working_dir: "{{ drupal_composer_install_dir }}"
-# with_items: "{{ drupal_composer_dependencies | default([]) }}"
-# become: false
-# environment:
-# COMPOSER_PROCESS_TIMEOUT: 1200
-# COMPOSER_MEMORY_LIMIT: '-1'

provisioning/roles/geerlingguy.drupal/tasks/build-composer.yml

@@ -29,25 +29,13 @@
  when: not drupal_site_exists
  become: false
 
-# Use manual composer require tasks until Ansible 2.10.4 is released.
 - name: Install dependencies with composer require (this may take a while).
- command: "{{ composer_path }} require {{ item }} -d {{ drupal_composer_install_dir }}"
- register: composer_require_result
- changed_when: "'Nothing to install' not in composer_require_result.stderr"
- with_items: "{{ drupal_composer_dependencies|default([]) }}"
+ composer:
+ command: require
+ arguments: "{{ item }}"
+ working_dir: "{{ drupal_composer_install_dir }}"
+ with_items: "{{ drupal_composer_dependencies | default([]) }}"
  become: false
  environment:
  COMPOSER_PROCESS_TIMEOUT: 1200
  COMPOSER_MEMORY_LIMIT: '-1'
-
-# Switch back to this task after Ansible 2.10.4 is released.
-# - name: Install dependencies with composer require (this may take a while).
-# composer:
-# command: require
-# arguments: "{{ item }}"
-# working_dir: "{{ drupal_composer_install_dir }}"
-# with_items: "{{ drupal_composer_dependencies | default([]) }}"
-# become: false
-# environment:
-# COMPOSER_PROCESS_TIMEOUT: 1200
-# COMPOSER_MEMORY_LIMIT: '-1'

provisioning/roles/geerlingguy.drupal/tasks/deploy.yml

@@ -25,25 +25,13 @@
  stat: "path={{ drupal_deploy_dir }}/composer.json"
  register: drupal_deploy_composer_file
 
-# Use manual composer require tasks until Ansible 2.10.4 is released.
 - name: Run composer install if composer.json is present.
- command: "composer install -d {{ drupal_deploy_dir }}{% if drupal_composer_no_dev %} --no-dev{% endif %}"
- register: composer_install_result
- changed_when: "'Nothing to install' not in composer_install_result.stderr"
+ composer:
+ command: install
+ working_dir: "{{ drupal_deploy_dir }}"
+ no_dev: "{{ drupal_composer_no_dev }}"
  when:
  - drupal_deploy_composer_file.stat.exists
  - drupal_deploy_composer_install
  become: "{{ drupal_core_owner_become }}"
  become_user: "{{ drupal_core_owner }}"
-
-# Switch back to this task after Ansible 2.10.4 is released.
-# - name: Run composer install if composer.json is present.
-# composer:
-# command: install
-# working_dir: "{{ drupal_deploy_dir }}"
-# no_dev: "{{ drupal_composer_no_dev }}"
-# when:
-# - drupal_deploy_composer_file.stat.exists
-# - drupal_deploy_composer_install
-# become: "{{ drupal_core_owner_become }}"
-# become_user: "{{ drupal_core_owner }}"