diff --git a/.github/workflows/pr-drupal-tests.yml b/.github/workflows/pr-drupal-tests.yml index 9aedd68..0c43a8c 100644 --- a/.github/workflows/pr-drupal-tests.yml +++ b/.github/workflows/pr-drupal-tests.yml @@ -32,6 +32,7 @@ jobs: - examples/drupal11-nginx lando-version: - 3-edge + - 3-stable os: - ubuntu-24.04 node-version: diff --git a/CHANGELOG.md b/CHANGELOG.md index f47f0e0..361c0be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }}) +* Added default config values to the `.lando.yml` file after init. * Updated globally installed Drush to `v8.5.0`. * Added docs for setting up [Drupal CMS](https://drupal.org/docs/drupal-cms). * Updated to [@lando/php@1.7.1](https://github.com/lando/php/releases/tag/v1.7.1). diff --git a/examples/drupal11/README.md b/examples/drupal11/README.md index d1443c9..f791f10 100644 --- a/examples/drupal11/README.md +++ b/examples/drupal11/README.md @@ -73,6 +73,16 @@ lando drush si --db-url=mysql://drupal11:drupal11@database/drupal11 -y cd drupal11 lando drush en jsonapi -y lando exec appserver -- curl localhost/jsonapi | grep "action--action" + +# Should have recipe defaults +cd drupal11 +cat .lando.yml | grep 'php: "8.3"' +cat .lando.yml | grep "drush: ^13" +cat .lando.yml | grep "composer_version: 2-latest" + +# Should still have webroot +cd drupal11 +cat .lando.yml | grep "webroot: ." ``` ## Destroy tests diff --git a/inits/drupal10.js b/inits/drupal10.js index b7ce9e6..e52f113 100644 --- a/inits/drupal10.js +++ b/inits/drupal10.js @@ -5,4 +5,9 @@ */ module.exports = { name: 'drupal10', + defaults: { + 'php': '8.1', + 'drush': '^11', + 'composer_version': '2-latest', + }, }; diff --git a/inits/drupal11.js b/inits/drupal11.js index 8a46488..a91b93d 100644 --- a/inits/drupal11.js +++ b/inits/drupal11.js @@ -5,4 +5,9 @@ */ module.exports = { name: 'drupal11', + defaults: { + 'php': '8.3', + 'drush': '^13', + 'composer_version': '2-latest', + }, }; diff --git a/inits/drupal6.js b/inits/drupal6.js index 03e8b27..8dd78da 100644 --- a/inits/drupal6.js +++ b/inits/drupal6.js @@ -5,4 +5,8 @@ */ module.exports = { name: 'drupal6', + defaults: { + 'php': '5.6', + 'drush': '8.4.5', + }, }; diff --git a/inits/drupal7.js b/inits/drupal7.js index 5f04823..a23d3a2 100644 --- a/inits/drupal7.js +++ b/inits/drupal7.js @@ -5,4 +5,7 @@ */ module.exports = { name: 'drupal7', + defaults: { + 'php': '7.4', + }, }; diff --git a/inits/drupal8.js b/inits/drupal8.js index 6300a8e..9b24679 100644 --- a/inits/drupal8.js +++ b/inits/drupal8.js @@ -5,4 +5,7 @@ */ module.exports = { name: 'drupal8', + defaults: { + 'php': '7.3', + }, }; diff --git a/inits/drupal9.js b/inits/drupal9.js index 81f749c..d13fe2b 100644 --- a/inits/drupal9.js +++ b/inits/drupal9.js @@ -5,4 +5,9 @@ */ module.exports = { name: 'drupal9', + defaults: { + 'php': '8.0', + 'drush': '^11', + 'composer_version': '2-latest', + }, };