Skip to content

Commit c13725e

Browse files
rfayclaude
andauthored
fix: pin Drush below 15 so Drupal 12 workspaces finish setup (#250)
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
1 parent 25a1676 commit c13725e

5 files changed

Lines changed: 7 additions & 5 deletions

File tree

‎drupal-contrib/scripts/test-issue-branches.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ for SPEC in "${TESTS[@]}"; do
132132
# --- Add drush as require-dev and run ddev poser ---
133133
if [ ! -f web/index.php ]; then
134134
log "Adding drush as require-dev..."
135-
ddev exec composer require --dev drush/drush --no-update --no-interaction 2>&1 | tail -5
135+
ddev exec composer require --dev "drush/drush:<15" --no-update --no-interaction 2>&1 | tail -5
136136

137137
log "Running ddev poser..."
138138
if ! ddev poser 2>&1 | tail -10; then

‎drupal-contrib/template.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,7 @@ COMPOSE_EOF
745745
# Direct JSON edit (not `composer require`) per ddev-drupal-contrib README.
746746
log_setup "Adding drush to require-dev..."
747747
update_status "⏳ drush: Adding to composer.json..."
748-
jq '.["require-dev"]["drush/drush"] = "*"' composer.json > composer.json.tmp && mv composer.json.tmp composer.json
748+
jq '.["require-dev"]["drush/drush"] = "<15"' composer.json > composer.json.tmp && mv composer.json.tmp composer.json
749749
750750
# Allow all Composer plugins in this dev environment. Composer 2.2+ blocks
751751
# unknown plugins by default; modules can pull in arbitrary plugins (e.g.

‎drupal-core/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ ddev start
125125
ddev add-on get amateescu/ddev-drupal-dev
126126
ddev restart
127127
ddev composer install
128-
ddev composer require drush/drush
128+
ddev composer require "drush/drush:<15"
129129
ddev drush si -y demo_umami --account-pass=admin
130130
```
131131

‎drupal-core/scripts/test-issue-branches.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ for PAIR in "${TESTS[@]}"; do
148148
ddev composer install 2>&1 || COMPOSER_EXIT=$?
149149

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

154154
# --- Record result ---

‎drupal-core/template.tf‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -997,7 +997,9 @@ TESTENV_EOF
997997
if [ "$SETUP_FAILED" != "true" ]; then
998998
log_setup "Adding Drush to composer.local.json..."
999999
update_status "⏳ Drush install: In progress..."
1000-
if ddev composer require drush/drush >> "$SETUP_LOG" 2>&1; then
1000+
# Drush 15 (Drupal 12+) replaced the drush command with a stub that recurses
1001+
# forever; 14.x still supports Drupal 12. See drush-ops/drush#6673.
1002+
if ddev composer require "drush/drush:<15" >> "$SETUP_LOG" 2>&1; then
10011003
log_setup "✓ Drush installed"
10021004
update_status "✓ Drush install: Success"
10031005
else

0 commit comments

Comments
 (0)