From ce73f3887833d4513cea492a8943f31d36d2ee1f Mon Sep 17 00:00:00 2001
From: James Sansbury <33516-q0rban@users.noreply.drupalcode.org>
Date: Sat, 10 May 2025 23:18:24 +0000
Subject: [PATCH] Issue #3514809: Update SDDS Tugboat to get media showing up
and redirect to XB editor
---
.tugboat/config.yml | 36 +++++++-----------------------------
composer.json | 4 ++--
2 files changed, 9 insertions(+), 31 deletions(-)
diff --git a/.tugboat/config.yml b/.tugboat/config.yml
index c6c8bcd6..a444a70e 100644
--- a/.tugboat/config.yml
+++ b/.tugboat/config.yml
@@ -11,18 +11,15 @@ services:
- |
set -eux
+ rm -Rf $DRUPAL_COMPOSER_ROOT
+ composer create phenaproxima/xb-demo --stability=dev $DRUPAL_COMPOSER_ROOT
+
# This is an environment variable we added in the Dockerfile that
# provides the path to Drupal composer root (not the web root).
cd $DRUPAL_COMPOSER_ROOT
- # Configure composer to require this module as a symlink.
- composer config minimum-stability dev
composer config repositories.tugboat path $TUGBOAT_ROOT
- composer require \
- drupal/civictheme \
- drupal/default_content \
- drupal/experience_builder \
- drupal/components
+ composer require drupal/demo_design_system:dev-main
# Install Drupal on the site.
rm -f $DRUPAL_DOCROOT/sites/default/settings.php
@@ -32,11 +29,11 @@ services:
--db-url=mysql://tugboat:tugboat@mysql:3306/tugboat \
--site-name="Live preview for ${TUGBOAT_PREVIEW_NAME}" \
--account-pass=admin \
- site:install standard
+ site:install drupal_cms_installer
# Require settings.local.php increase CLI memory limit, add trusted
# host patterns, and allow for enabling hidden xb_dev_standard module.
- echo "require_once '$TUGBOAT_ROOT/.tugboat/settings.local.php';" >> $DOCROOT/sites/default/settings.php
+ echo "require_once '$TUGBOAT_ROOT/.tugboat/settings.local.php';" >> $DRUPAL_DOCROOT/sites/default/settings.php
# Set up the files directory permissions.
mkdir -p $DRUPAL_DOCROOT/sites/default/files
@@ -44,21 +41,6 @@ services:
chmod 2775 $DRUPAL_DOCROOT/sites/default/files
chmod -R g+w $DRUPAL_DOCROOT/sites/default/files
- # Enable the module.
- vendor/bin/drush --yes pm:install \
- components \
- default_content \
- experience_builder \
- media_library \
- xb_dev_standard
-
- # Enable starshot_demo theme.
- vendor/bin/drush --yes theme:enable starshot_demo
- vendor/bin/drush --yes config:set system.theme default starshot_demo
-
- # Create node/1
- vendor/bin/drush scr $TUGBOAT_ROOT/.tugboat/create-article-node.php
-
build:
# Update Drupal core composer packages and run any Drupal updates.
- |
@@ -66,11 +48,7 @@ services:
cd $DRUPAL_COMPOSER_ROOT
composer install --optimize-autoloader
# Update packages and dependencies.
- composer update --with-all-dependencies \
- drupal/civictheme \
- drupal/default_content \
- drupal/components \
- drupal/experience_builder
+ composer update --with-all-dependencies drupal/demo_design_system
# Run Drupal updates
vendor/bin/drush --yes updb
vendor/bin/drush cache:rebuild
diff --git a/composer.json b/composer.json
index 0a86a380..30fd8510 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
{
- "name": "drupal/civictheme",
- "description": "CivicTheme is a Drupal 10 component-based theme.",
+ "name": "drupal/demo_design_system",
+ "description": "The Starshot Demo Design System for Experience Builder.",
"type": "drupal-theme",
"license": "GPL-2.0-or-later",
"homepage": "https://github.com/civictheme/civictheme",
--
GitLab