Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion drupal-contrib/scripts/test-issue-branches.sh
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ for SPEC in "${TESTS[@]}"; do
# --- Add drush as require-dev and run ddev poser ---
if [ ! -f web/index.php ]; then
log "Adding drush as require-dev..."
ddev exec composer require --dev drush/drush --no-update --no-interaction 2>&1 | tail -5
ddev exec composer require --dev "drush/drush:<15" --no-update --no-interaction 2>&1 | tail -5

log "Running ddev poser..."
if ! ddev poser 2>&1 | tail -10; then
Expand Down
2 changes: 1 addition & 1 deletion drupal-contrib/template.tf
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,7 @@ COMPOSE_EOF
# Direct JSON edit (not `composer require`) per ddev-drupal-contrib README.
log_setup "Adding drush to require-dev..."
update_status "⏳ drush: Adding to composer.json..."
jq '.["require-dev"]["drush/drush"] = "*"' composer.json > composer.json.tmp && mv composer.json.tmp composer.json
jq '.["require-dev"]["drush/drush"] = "<15"' composer.json > composer.json.tmp && mv composer.json.tmp composer.json

# Allow all Composer plugins in this dev environment. Composer 2.2+ blocks
# unknown plugins by default; modules can pull in arbitrary plugins (e.g.
Expand Down
2 changes: 1 addition & 1 deletion drupal-core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ ddev start
ddev add-on get amateescu/ddev-drupal-dev
ddev restart
ddev composer install
ddev composer require drush/drush
ddev composer require "drush/drush:<15"
ddev drush si -y demo_umami --account-pass=admin
```

Expand Down
2 changes: 1 addition & 1 deletion drupal-core/scripts/test-issue-branches.sh
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ for PAIR in "${TESTS[@]}"; do
ddev composer install 2>&1 || COMPOSER_EXIT=$?

if [ "$COMPOSER_EXIT" = "0" ]; then
ddev composer require drush/drush 2>&1 | tail -5
ddev composer require "drush/drush:<15" 2>&1 | tail -5
fi

# --- Record result ---
Expand Down
4 changes: 3 additions & 1 deletion drupal-core/template.tf
Original file line number Diff line number Diff line change
Expand Up @@ -997,7 +997,9 @@ TESTENV_EOF
if [ "$SETUP_FAILED" != "true" ]; then
log_setup "Adding Drush to composer.local.json..."
update_status "⏳ Drush install: In progress..."
if ddev composer require drush/drush >> "$SETUP_LOG" 2>&1; then
# Drush 15 (Drupal 12+) replaced the drush command with a stub that recurses
# forever; 14.x still supports Drupal 12. See drush-ops/drush#6673.
if ddev composer require "drush/drush:<15" >> "$SETUP_LOG" 2>&1; then
log_setup "✓ Drush installed"
update_status "✓ Drush install: Success"
else
Expand Down
Loading