Skip to content
This repository was archived by the owner on Feb 13, 2023. It is now read-only.

Commit 1ae7c38

Browse files
geerlingguygeerlingguy
committed
Issue #2050: Update Drupal role to latest version.
1 parent f6cb420 commit 1ae7c38

File tree

12 files changed

+79
-27
lines changed

12 files changed

+79
-27
lines changed

‎provisioning/requirements.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ roles:
1919
- name: geerlingguy.daemonize
2020
version: 1.2.1
2121
- name: geerlingguy.drupal
22-
version: 3.0.1
22+
version: 4.0.0
2323
- name: geerlingguy.drupal-console
2424
version: 1.1.1
2525
- name: geerlingguy.drush

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

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# Configuration for probot-stale - https://github.com/probot/stale
2+
3+
# Number of days of inactivity before an Issue or Pull Request becomes stale
4+
daysUntilStale: 90
5+
6+
# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
7+
# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
8+
daysUntilClose: 30
9+
10+
# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
11+
onlyLabels: []
12+
13+
# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
14+
exemptLabels:
15+
- pinned
16+
- security
17+
- planned
18+
19+
# Set to true to ignore issues in a project (defaults to false)
20+
exemptProjects: false
21+
22+
# Set to true to ignore issues in a milestone (defaults to false)
23+
exemptMilestones: false
24+
25+
# Set to true to ignore issues with an assignee (defaults to false)
26+
exemptAssignees: false
27+
28+
# Label to use when marking as stale
29+
staleLabel: stale
30+
31+
# Limit the number of actions per hour, from 1-30. Default is 30
32+
limitPerRun: 30
33+
34+
pulls:
35+
markComment: |-
36+
This pull request has been marked 'stale' due to lack of recent activity. If there is no further activity, the PR will be closed in another 30 days. Thank you for your contribution!
37+
38+
Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark pull requests as stale.
39+
40+
unmarkComment: >-
41+
This pull request is no longer marked for closure.
42+
43+
closeComment: >-
44+
This pull request has been closed due to inactivity. If you feel this is in error, please reopen the pull request or file a new PR with the relevant details.
45+
46+
issues:
47+
markComment: |-
48+
This issue has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution!
49+
50+
Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark issues as stale.
51+
52+
unmarkComment: >-
53+
This issue is no longer marked for closure.
54+
55+
closeComment: >-
56+
This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.

‎provisioning/roles/geerlingguy.drupal/.travis.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,16 @@ env:
66
global:
77
- ROLE_NAME: drupal
88
matrix:
9-
- MOLECULE_DISTRO: centos7
9+
- MOLECULE_DISTRO: centos8
1010
- MOLECULE_DISTRO: ubuntu1804
11-
- MOLECULE_DISTRO: debian9
12-
- MOLECULE_DISTRO: centos7
11+
# See: https://github.com/geerlingguy/ansible-role-drupal/issues/77
12+
# - MOLECULE_DISTRO: debian10
13+
- MOLECULE_DISTRO: centos8
1314
MOLECULE_PLAYBOOK: playbook-deploy.yml
1415

1516
install:
1617
# Install test dependencies.
17-
- pip install molecule docker
18+
- pip install molecule yamllint ansible-lint docker
1819

1920
before_script:
2021
# Use actual Ansible Galaxy role name for the project directory.

provisioning/roles/geerlingguy.drupal/molecule/default/yaml-lint.yml renamed to provisioning/roles/geerlingguy.drupal/.yamllint

File renamed without changes.

‎provisioning/roles/geerlingguy.drupal/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ If you set the `bin-dir` in your project's `composer.json` file to a value other
6767
### Create a new project using `composer create-project` (Composer)
6868

6969
drupal_build_composer_project: true
70-
drupal_composer_project_package: "drupal/recommended-project:^8@dev"
70+
drupal_composer_project_package: "drupal/recommended-project:^9@dev"
7171
drupal_composer_project_options: "--prefer-dist --stability dev --no-interaction"
7272

7373
Set this to `true` and `drupal_build_makefile`, `drupal_build_composer` to `false` if you are using Composer's `create-project` as a site deployment strategy.

‎provisioning/roles/geerlingguy.drupal/defaults/main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ drupal_composer_dependencies:
3131
# 'false' if you are using Composer's create-project as a site deployment
3232
# strategy.
3333
drupal_build_composer_project: true
34-
drupal_composer_project_package: "drupal/recommended-project:^8@dev"
34+
drupal_composer_project_package: "drupal/recommended-project:^9@dev"
3535
drupal_composer_project_options: "--prefer-dist --stability dev --no-interaction"
3636

3737
# Required Drupal settings.

‎provisioning/roles/geerlingguy.drupal/meta/main.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
dependencies: []
33

44
galaxy_info:
5+
role_name: drupal
56
author: geerlingguy
67
description: Deploy or install Drupal on your servers.
78
company: "Midwestern Mac, LLC"

provisioning/roles/geerlingguy.drupal/molecule/default/playbook.yml renamed to provisioning/roles/geerlingguy.drupal/molecule/default/converge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
roles:
1616
- name: geerlingguy.repo-remi
17-
when: ansible_os_family == "RedHat"
17+
when: ansible_os_family == 'RedHat'
1818
- role: geerlingguy.repo-dotdeb
1919
when: ansible_distribution == 'Debian'
2020
- role: geerlingguy.apache

‎provisioning/roles/geerlingguy.drupal/molecule/default/molecule.yml‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ dependency:
33
name: galaxy
44
driver:
55
name: docker
6-
lint:
7-
name: yamllint
8-
options:
9-
config-file: molecule/default/yaml-lint.yml
6+
lint: |
7+
set -e
8+
yamllint .
9+
ansible-lint
1010
platforms:
1111
- name: instance
1212
image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
@@ -17,13 +17,5 @@ platforms:
1717
pre_build_image: true
1818
provisioner:
1919
name: ansible
20-
lint:
21-
name: ansible-lint
2220
playbooks:
23-
converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
24-
scenario:
25-
name: default
26-
verifier:
27-
name: testinfra
28-
lint:
29-
name: flake8
21+
converge: ${MOLECULE_PLAYBOOK:-converge.yml}

‎provisioning/roles/geerlingguy.drupal/molecule/default/playbook-deploy.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
when: ansible_distribution == 'Debian'
2929
- role: geerlingguy.apache
3030
- role: geerlingguy.mysql
31+
- role: geerlingguy.php-versions
3132
- role: geerlingguy.php
3233
- role: geerlingguy.php-mysql
3334
- role: geerlingguy.git

0 commit comments

Comments
 (0)