Skip to content

Commit

Permalink
Update PHP, Drupal, Drush, Composer for Composer 2 support (#193)
Browse files Browse the repository at this point in the history
* Update PHP, Drupal, Drush, Composer.
* Fix composer-drupal-optimizations version to ^1.1
* Fix Drupal project to an exact version to avoid defaulting to 8.9.x-dev
  • Loading branch information
alxp authored Nov 5, 2020
1 parent 8d94d21 commit 7cd01da
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 11 deletions.
2 changes: 1 addition & 1 deletion crayfish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
become: yes

vars:
php_version: "7.2"
php_version: "7.4"

roles:
- name: geerlingguy.repo-remi
Expand Down
9 changes: 4 additions & 5 deletions inventory/vagrant/group_vars/webserver/drupal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@ drupal_build_composer_project: true
drupal_composer_install_dir: /var/www/html/drupal
drupal_core_owner: "{{ ansible_user }}"
drupal_composer_dependencies:
- "zaporylie/composer-drupal-optimizations:^1.0"
- "drupal/console:~1.0"
- "zaporylie/composer-drupal-optimizations:^1.1"
- "drupal/devel:^2.0"
- "drush/drush:^9.0"
- "drush/drush:^10.3"
- "drupal/rdfui:^1.0-beta1"
- "drupal/restui:^1.16"
- "drupal/search_api_solr:^4.1"
Expand All @@ -20,8 +19,8 @@ drupal_composer_dependencies:
- "drupal/transliterate_filenames:^1.3"
- "islandora/carapace:dev-8.x-3.x"
- "islandora/islandora_defaults:dev-8.x-1.x"
- "islandora-rdm/islandora_fits:dev-master"
drupal_composer_project_package: "islandora/drupal-project:8.8.1"
- "islandora-rdm/islandora_fits:dev-8.x-1.x"
drupal_composer_project_package: "drupal/recommended-project:8.9.7"
drupal_composer_project_options: "--prefer-dist --stability dev --no-interaction"
drupal_core_path: "{{ drupal_composer_install_dir }}/web"
drupal_db_user: drupal8
Expand Down
8 changes: 4 additions & 4 deletions vars/Debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
grok_version_tag: v3.1.0

php_packages_extra:
- libapache2-mod-php7.2
- php7.2-mysql
- php7.2-pgsql
- php7.2-gd
- libapache2-mod-php7.4
- php7.4-mysql
- php7.4-pgsql
- php7.4-gd

2 changes: 1 addition & 1 deletion webserver.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
become: yes

vars:
php_version: "7.2"
php_version: "7.4"

environment:
COMPOSER_MEMORY_LIMIT: -1
Expand Down

0 comments on commit 7cd01da

Please sign in to comment.