Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow aljibe-installed sites to be able to install recipes #26

Merged
merged 4 commits into from
Dec 11, 2024
Merged

Allow aljibe-installed sites to be able to install recipes #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3e27a20
Allow aljibe-installed sites to be able to install recipes
omarlopesino Dec 10, 2024
2acd47a
Fix composer.json and patches needed to support to recipes
omarlopesino Dec 10, 2024
e5ed2a0
Merge branch 'main' into feature/recipes-support
juanjol Dec 11, 2024
f255948
Recipes on Drupal 11 installation too.
juanjol Dec 11, 2024
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
13 changes: 13 additions & 0 deletions kickstart/common/patches/drupal-core-3315694-1.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/core/lib/Drupal/Core/Recipe/RecipeCommand.php b/core/lib/Drupal/Core/Recipe/RecipeCommand.php
index 3040e40960..6d6f496ada 100644
--- a/core/lib/Drupal/Core/Recipe/RecipeCommand.php
+++ b/core/lib/Drupal/Core/Recipe/RecipeCommand.php
@@ -192,7 +192,7 @@ private function rollBackToCheckpoint(Checkpoint $checkpoint): void {
* Exception thrown if kernel does not boot.
*/
protected function boot() {
- $kernel = new DrupalKernel('prod', $this->classLoader);
+ $kernel = new DrupalKernel('prod', $this->classLoader, FALSE);
$kernel::bootEnvironment();
$kernel->setSitePath($this->getSitePath());
Settings::initialize($kernel->getAppRoot(), $kernel->getSitePath(), $this->classLoader);
13 changes: 13 additions & 0 deletions kickstart/common/patches/drupal-core-3416735-1.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/core/lib/Drupal/Core/StreamWrapper/StreamWrapperManager.php b/core/lib/Drupal/Core/StreamWrapper/StreamWrapperManager.php
index 1c08700dc69109ee3d9d6a3cfdbd2227b07cef34..93b7419d93fe718b711fabf2b12d785cb57b3e7c 100644
--- a/core/lib/Drupal/Core/StreamWrapper/StreamWrapperManager.php
+++ b/core/lib/Drupal/Core/StreamWrapper/StreamWrapperManager.php
@@ -162,6 +162,8 @@ public function addStreamWrapper($service_id, $class, $scheme) {
'type' => $class::getType(),
'service_id' => $service_id,
];
+
+ $this->registerWrapper($scheme, $class, $class::getType());
}

/**
24 changes: 21 additions & 3 deletions kickstart/d10/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
}
],
"repositories": [
{
"type": "vcs",
"url": "https://github.com/woredeyonas/Drupal-Recipe-Unpack.git"
},
{
"type": "composer",
"url": "https://packages.drupal.org/8"
Expand Down Expand Up @@ -41,7 +45,8 @@
"metadrop/drupal-artifact-builder": "^2.0.2"
},
"require-dev": {
"metadrop/drupal-dev": "^2.6.0"
"metadrop/drupal-dev": "^2.6.0",
"ewcomposer/unpack": "dev-master"
},
"conflict": {
"drupal/drupal": "*"
Expand All @@ -63,18 +68,28 @@
"php-http/discovery": true,
"phpro/grumphp": true,
"phpstan/extension-installer": true,
"tbachert/spi": true
"tbachert/spi": true,
"ewcomposer/unpack": true
}
},
"scripts": {
"drupal-scaffold": "DrupalComposer\\DrupalScaffold\\Plugin::scaffold"
},
"extra": {
"patches": {
"drupal/core": {
"Stream wrappers not registered when installing module's default config - https://www.drupal.org/project/drupal/issues/3416735": "https://git.drupalcode.org/project/drupal/-/merge_requests/10421.diff",
"Allow recipe command to write to the container ensuring that cache does not be cleared after a recipe installs a module - https://www.drupal.org/project/drupal/issues/3315694": "patches/drupal-core-3315694-1.patch"
}
},
"drupal-scaffold": {
"locations": {
"web-root": "./web"
}
},
"installer-types": [
"drupal-recipe"
],
"installer-paths": {
"web/core": ["type:drupal-core"],
"web/libraries/{$name}": ["type:drupal-library"],
Expand All @@ -84,7 +99,10 @@
"drush/Commands/contrib/{$name}": ["type:drupal-drush"],
"web/modules/custom/{$name}": ["type:drupal-custom-module"],
"web/profiles/custom/{$name}": ["type:drupal-custom-profile"],
"web/themes/custom/{$name}": ["type:drupal-custom-theme"]
"web/themes/custom/{$name}": ["type:drupal-custom-theme"],
"web/recipes/{$name}": [
"type:drupal-recipe"
]
},
"dev-files": {
"bin": [
Expand Down
22 changes: 20 additions & 2 deletions kickstart/d11/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
}
],
"repositories": [
{
"type": "vcs",
"url": "https://github.com/woredeyonas/Drupal-Recipe-Unpack.git"
},
{
"type": "composer",
"url": "https://packages.drupal.org/8"
Expand All @@ -28,7 +32,8 @@
"metadrop/drupal-artifact-builder": "^1.4"
},
"require-dev": {
"metadrop/drupal-dev": "^2.0.0"
"metadrop/drupal-dev": "^2.6.0",
"ewcomposer/unpack": "dev-master"
},
"conflict": {
"drupal/drupal": "*"
Expand All @@ -50,18 +55,28 @@
"metadrop/composer-comments": true,
"php-http/discovery": true,
"tbachert/spi": true,
"ewcomposer/unpack": true,
"mxr576/ddqg-composer-audit": true
}
},
"scripts": {
"drupal-scaffold": "DrupalComposer\\DrupalScaffold\\Plugin::scaffold"
},
"extra": {
"patches": {
"drupal/core": {
"Stream wrappers not registered when installing module's default config - https://www.drupal.org/project/drupal/issues/3416735": "https://git.drupalcode.org/project/drupal/-/merge_requests/10421.diff",
"Allow recipe command to write to the container ensuring that cache does not be cleared after a recipe installs a module - https://www.drupal.org/project/drupal/issues/3315694": "patches/drupal-core-3315694-1.patch"
}
},
"drupal-scaffold": {
"locations": {
"web-root": "./web"
}
},
"installer-types": [
"drupal-recipe"
],
"installer-paths": {
"web/core": ["type:drupal-core"],
"web/libraries/{$name}": ["type:drupal-library"],
Expand All @@ -71,7 +86,10 @@
"drush/Commands/contrib/{$name}": ["type:drupal-drush"],
"web/modules/custom/{$name}": ["type:drupal-custom-module"],
"web/profiles/custom/{$name}": ["type:drupal-custom-profile"],
"web/themes/custom/{$name}": ["type:drupal-custom-theme"]
"web/themes/custom/{$name}": ["type:drupal-custom-theme"],
"web/recipes/{$name}": [
"type:drupal-recipe"
]
},
"dev-files": {
"bin": [
Expand Down
Loading