Skip to content

Commit 6ddcb4d

Browse files
authored
Drupal template fixes pr 1.x (#126)
* Adding a Drupal 9 template to ce-dev. * Testing nodejs version change with blank template. * Incrementing version for release. * There's no drupal9 template for ce-deploy. * Updating Drupal templates. * Removing docs steps for ansible because they cannot work. * Suppressing unattended-upgrades. * Adding composer plugins to Drupal 8 deployments. * Adding the phpcodesniffer plugin for D8.
1 parent 0d25cfe commit 6ddcb4d

File tree

9 files changed

+45
-202
lines changed

9 files changed

+45
-202
lines changed

.github/workflows/ce-provision-build-docs.yml

Lines changed: 0 additions & 48 deletions
This file was deleted.

contribute/toc.sh

Lines changed: 0 additions & 140 deletions
This file was deleted.

templates/blank/ce-dev/ansible/provision.yml.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
enable_vnc: true
1313
- nodejs:
1414
version: 14.x
15+
- apt_unattended_upgrades:
16+
enable: false
1517
tasks:
1618
- apt:
1719
update_cache: true

templates/drupal8/ce-dev/ansible/deploy.yml.j2

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,35 @@
3838
pre_tasks:
3939
# You can safely remove these steps once you have a working composer.json.
4040
- name: Download composer file.
41-
get_url:
42-
url: https://raw.githubusercontent.com/drupal/recommended-project/8.8.x/composer.json
41+
ansible.builtin.get_url:
42+
url: https://raw.githubusercontent.com/drupal/recommended-project/8.9.x/composer.json
4343
dest: "{{ deploy_path }}/composer.json"
4444
force: false
45+
- name: Adding composer/installers plugin to composer config.
46+
community.general.composer:
47+
command: config
48+
arguments: allow-plugins.composer/installers true
49+
working_dir: "{{ deploy_path }}"
50+
- name: Adding drupal/core-composer-scaffold plugin to composer config.
51+
community.general.composer:
52+
command: config
53+
arguments: allow-plugins.drupal/core-composer-scaffold true
54+
working_dir: "{{ deploy_path }}"
55+
- name: Adding drupal/core-project-message plugin to composer config.
56+
community.general.composer:
57+
command: config
58+
arguments: allow-plugins.drupal/core-project-message true
59+
working_dir: "{{ deploy_path }}"
60+
- name: Adding dealerdirect/phpcodesniffer-composer-installer plugin to composer config.
61+
community.general.composer:
62+
command: config
63+
arguments: allow-plugins.dealerdirect/phpcodesniffer-composer-installer true
64+
working_dir: "{{ deploy_path }}"
4565
- name: Install drush.
46-
command:
47-
cmd: composer require drush/drush "^10.6.2"
48-
chdir: "{{ deploy_path }}"
66+
community.general.composer:
67+
command: require
68+
arguments: drush/drush:10.*
69+
working_dir: "{{ deploy_path }}"
4970
roles:
5071
- _init # Sets some variables the deploy scripts rely on.
5172
- composer # Composer install step.

templates/drupal8/ce-dev/ansible/provision.yml.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
cli: true
4747
- lhci:
4848
enable_vnc: true
49+
- apt_unattended_upgrades:
50+
enable: false
4951
{% endraw %}
5052
tasks:
5153
- apt:

templates/drupal9/ce-dev/ansible/deploy.yml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
# You can safely remove these steps once you have a working composer.json.
4747
- name: Download composer file.
4848
ansible.builtin.get_url:
49-
url: https://raw.githubusercontent.com/drupal/recommended-project/9.3.x/composer.json
49+
url: https://raw.githubusercontent.com/drupal/recommended-project/9.5.x/composer.json
5050
dest: "{{ deploy_path }}/composer.json"
5151
force: false
5252
- name: Install drush.

templates/drupal9/ce-dev/ansible/provision.yml.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@
5252
enable_vnc: true
5353
- nodejs:
5454
version: 16.x
55+
- apt_unattended_upgrades:
56+
enable: false
5557
{% endraw %}
5658
tasks:
5759
- apt:

templates/localgov/ce-dev/ansible/deploy.yml.j2

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,20 @@
3838
pre_tasks:
3939
# You can safely remove these steps once you have a working composer.json.
4040
- name: Download composer file.
41-
get_url:
42-
url: https://raw.githubusercontent.com/drupal/recommended-project/9.3.x/composer.json
41+
ansible.builtin.get_url:
42+
url: https://raw.githubusercontent.com/drupal/recommended-project/10.1.x/composer.json
4343
dest: "{{ deploy_path }}/composer.json"
4444
force: false
4545
- name: Install drush.
46-
command:
47-
cmd: composer require drush/drush:11.*
48-
chdir: "{{ deploy_path }}"
46+
community.general.composer:
47+
command: require
48+
arguments: drush/drush:11.*
49+
working_dir: "{{ deploy_path }}"
4950
- name: Install localgov.
50-
command:
51-
cmd: composer require localgovdrupal/localgov
52-
chdir: "{{ deploy_path }}"
51+
community.general.composer:
52+
command: require
53+
arguments: localgovdrupal/localgov
54+
working_dir: "{{ deploy_path }}"
5355
roles:
5456
- _init # Sets some variables the deploy scripts rely on.
5557
- composer # Composer install step.

templates/localgov/ce-dev/ansible/provision.yml.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
cli: true
4747
- lhci:
4848
enable_vnc: true
49+
- apt_unattended_upgrades:
50+
enable: false
4951
{% endraw %}
5052
tasks:
5153
- apt:

0 commit comments

Comments
 (0)