OpenEcoLab-LasAlpujarras
/
farmOS
mirror of https://github.com/farmOS/farmOS.git
3
0
Fork 0
Code Wiki

Rename farm_install_modules to farm.

This commit is contained in:
Michael Stenta 2021-03-18 11:51:53 -04:00
parent d6cf678a36
commit 4bd1855b91
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/run-tests.yml vendored
View File

@ -66,4 +66,4 @@ jobs:
# https://github.com/drupal/drupal/blob/74fbb0aabdee3e1a5da7b8e489a725afdc5824fd/core/tests/Drupal/Tests/Listeners/HtmlOutputPrinter.php
run: docker-compose exec -u www-data -T test-runner paratest --functional --passthru='--printer=PHPUnit\\TextUI\\DefaultResultPrinter' --verbose=1 /opt/drupal/web/profiles/farm
- name: Test Drush site install with all modules
run: docker-compose exec -u www-data -T www drush site-install --db-url=${{ matrix.DB_URL }} farm farm_install_modules.modules='all'
run: docker-compose exec -u www-data -T www drush site-install --db-url=${{ matrix.DB_URL }} farm farm.modules='all'

4
farm.install
View File

@ -58,8 +58,8 @@ function farm_install_modules(array &$install_state) {
// profile arguments. We assume this is an array of module machine names,
// unless it is simply the string "all", which is a shortcut for installing
// all modules.
if (!empty($install_state['forms']['farm_install_modules']['modules'])) {
$modules_arg = $install_state['forms']['farm_install_modules']['modules'];
if (!empty($install_state['forms']['farm']['modules'])) {
$modules_arg = $install_state['forms']['farm']['modules'];
if ($modules_arg === 'all') {
$all = farm_modules();
$modules = array_merge(array_keys($all['default']), array_keys($all['optional']));