Skip to content
This repository has been archived by the owner on Aug 8, 2024. It is now read-only.

Commit

Permalink
Remove workaround, now that there is an open issue and patch for the …
Browse files Browse the repository at this point in the history
…bug.
  • Loading branch information
phenaproxima committed Apr 29, 2024
1 parent 0eee714 commit 94d7a48
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 8 deletions.
7 changes: 3 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,10 @@
},
"scripts": {
"drupal:install": [
"@putenv SHELL_VERBOSITY=-1",
"drush site-install minimal --yes",
"drush site-install minimal --yes --quiet",
"cd web && php core/scripts/drupal recipe ../recipes/starshot",
"drush theme:uninstall --yes stark",
"drush views:disable files --yes",
"drush theme:uninstall --yes --quiet stark",
"drush views:disable files --quiet --yes",
"drush cache:rebuild"
],
"drupal:install-dev": [
Expand Down
12 changes: 11 additions & 1 deletion patches.lock.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"_hash": "4cc00701e1836558692890a43b586eabe1ae056ae44f42ba90eb7f7b85b26917",
"_hash": "7f6c32c40d0a9ffaa92ad93e4b59798d437aa5bfa6725ae6e6449c356f208355",
"patches": {
"drupal/core": [
{
Expand All @@ -21,6 +21,16 @@
"extra": {
"provenance": "dependency:drupal/core"
}
},
{
"package": "drupal/core",
"description": "#3444241: RecipeRunner::toBatchOperations() should disambiguate recipes by path, not by human-readable name",
"url": "https://git.drupalcode.org/project/distributions_recipes/-/merge_requests/133.diff",
"sha256": "2b8c1930e5667778ad4008748a366fde2bcec00d1eeaf730077d7711854d8f14",
"depth": 2,
"extra": {
"provenance": "dependency:drupal/core"
}
}
]
}
Expand Down
3 changes: 0 additions & 3 deletions recipes/starshot/recipe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ name: Starshot
description: Applies all the Starshot recipes.
type: Site
recipes:
# This line is a tiny workaround for a bug where prerequisite recipes'
# configuration is not installed before the current recipe.
- image_media_type
- basic_block_type
- content_search
- core_recommended_performance
Expand Down

0 comments on commit 94d7a48

Please sign in to comment.