Skip to content

Commit

Permalink
Drush 13
Browse files Browse the repository at this point in the history
  • Loading branch information
rimi-itk committed Jan 8, 2025
1 parent 85285ad commit 1728d62
Show file tree
Hide file tree
Showing 5 changed files with 310 additions and 86 deletions.
9 changes: 8 additions & 1 deletion Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,14 @@ tasks:

drush:
cmds:
- task compose -- exec --no-TTY phpfpm vendor/bin/drush --uri={{.BASE_URL}} {{.CLI_ARGS}}
# Check if we have content on stdin (cf.
# https://unix.stackexchange.com/questions/762992/bash-check-if-the-standard-input-contains-anything)
- >-
if [[ ! -t 0 ]]; then
task compose -- exec --no-TTY phpfpm vendor/bin/drush --uri={{.BASE_URL}} {{.CLI_ARGS}};
else
task compose -- exec phpfpm vendor/bin/drush --uri={{.BASE_URL}} {{.CLI_ARGS}};
fi
silent: true

database-dump:
Expand Down
9 changes: 7 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"drupal/viewsreference": "^2.0@beta",
"drupal/webform": "^6.2@beta",
"drupal/xls_serialization": "^1.2",
"drush/drush": "^12",
"drush/drush": "^13",
"itk-dev/composer-virtualenv": "^1.0",
"itk-dev/itk_azure_video": "^2.0",
"itk-dev/itk_pretix": "^1.0",
Expand All @@ -77,7 +77,7 @@
"webflo/drupal-finder": "^1.0.0"
},
"require-dev": {
"drupal/content_fixtures": "^3.1",
"drupal/content_fixtures": "dev-3498162-not-compatible-with",
"drupal/core-dev": "^10.0",
"drupal/masquerade": "^2.0",
"ergebnis/composer-normalize": "^2.44",
Expand All @@ -90,6 +90,11 @@
"drupal/drupal": "*"
},
"repositories": {
"drupal/content_fixtures": {
"//": "Content fixtures: Not compatible with Drush 13+ (https://www.drupal.org/project/content_fixtures/issues/3498162)",
"type": "git",
"url": "https://git.drupalcode.org/issue/content_fixtures-3498162"
},
"drupal": {
"type": "composer",
"url": "https://packages.drupal.org/8"
Expand Down
Loading

0 comments on commit 1728d62

Please sign in to comment.