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.

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

Drupal 11 instance #1

Draft
wants to merge 24 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
9012b57
Updating to system requirements
mark-casias Nov 1, 2024
30e78aa
Composer update to ^10.3 with patches moved
mark-casias Nov 1, 2024
23e0d9e
Core file changes committed
mark-casias Nov 1, 2024
112c0f2
Fixing patch issue for menu_link_config
mark-casias Nov 1, 2024
d710073
Updating to Drupal 11
mark-casias Nov 1, 2024
426b3e6
tugboat DB update and menu_link_config patch
mark-casias Nov 1, 2024
7179623
updating dubbot patch and fixing install script
mark-casias Nov 1, 2024
45c879f
Config export from D11 upgrade
mark-casias Nov 1, 2024
fd02ac2
updating to dubbot-1.0.1
mark-casias Nov 1, 2024
2d9152a
refactor tugboat loader
mark-casias Nov 2, 2024
b0bf602
config import before content
mark-casias Nov 2, 2024
db0609f
tour debacle
mark-casias Nov 2, 2024
0072eec
default content out of config
mark-casias Nov 2, 2024
3fa32fa
initial attempt at adding JS file
mark-casias Nov 2, 2024
20163fc
need the api url somewhere in JS land
mark-casias Nov 2, 2024
dcb8c00
local highlight.js with change
mark-casias Nov 2, 2024
08ca08b
fixing api url.... again
mark-casias Nov 2, 2024
02f4b22
Adding apiurl to patch
mark-casias Nov 6, 2024
2f1edc9
moving js to block instead of controller
mark-casias Nov 7, 2024
4ec0b90
revert to external highlight.js
mark-casias Nov 7, 2024
375962a
updating the once and removing local highlight.js
mark-casias Nov 7, 2024
ad53800
Update to test permissions switch
mark-casias Nov 8, 2024
3366c99
Updating tab keys to match server
mark-casias Nov 14, 2024
8852358
typo in governance..
mark-casias Nov 14, 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
31 changes: 16 additions & 15 deletions .ddev/config.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
name: dubbot
type: drupal10
docroot: web
php_version: "8.2"
php_version: "8.3"
webserver_type: nginx-fpm
xdebug_enabled: false
additional_hostnames:
- es-dubbot
additional_fqdns: []
database:
type: mariadb
version: "10.4"
version: "10.6"
use_dns_when_possible: true
composer_version: "2"
web_environment: []
Expand All @@ -28,7 +28,7 @@ corepack_enable: false

# docroot: <relative_path> # Relative path to the directory containing index.php.

# php_version: "8.2" # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3"
# php_version: "8.2" # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3", "8.4"

# You can explicitly specify the webimage but this
# is not recommended, as the images are often closely tied to DDEV's' behavior,
Expand All @@ -39,8 +39,9 @@ corepack_enable: false
# database:
# type: <dbtype> # mysql, mariadb, postgres
# version: <version> # database version, like "10.11" or "8.0"
# MariaDB versions can be 5.5-10.8 and 10.11, MySQL versions can be 5.5-8.0
# PostgreSQL versions can be 9-16.
# MariaDB versions can be 5.5-10.8, 10.11, and 11.4.
# MySQL versions can be 5.5-8.0.
# PostgreSQL versions can be 9-17.

# router_http_port: <port> # Port to be used for http (defaults to global configuration, usually 80)
# router_https_port: <port> # Port for https (defaults to global configuration, usually 443)
Expand All @@ -58,6 +59,8 @@ corepack_enable: false
# webserver_type: nginx-fpm, apache-fpm, or nginx-gunicorn

# timezone: Europe/Berlin
# If timezone is unset, DDEV will attempt to derive it from the host system timezone
# using the $TZ environment variable or the /etc/localtime symlink.
# This is the timezone used in the containers and by PHP;
# it can be set to any valid timezone,
# see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
Expand All @@ -77,16 +80,14 @@ corepack_enable: false
# - preview
# - snapshot
# Alternatively, an explicit Composer version may be specified, for example "2.2.18".
# To reinstall Composer after the image was built, run "ddev debug refresh".
# To reinstall Composer after the image was built, run "ddev debug rebuild".

# nodejs_version: "20"
# change from the default system Node.js version to any other version.
# Numeric version numbers can be complete (i.e. 18.15.0) or
# incomplete (18, 17.2, 16). 'lts' and 'latest' can be used as well along with
# other named releases.
# see https://www.npmjs.com/package/n#specifying-nodejs-versions
# Note that you can continue using 'ddev nvm' or nvm inside the web container
# to change the project's installed node version if you need to.
# See https://ddev.readthedocs.io/en/stable/users/configuration/config/#nodejs_version for more information
# and https://www.npmjs.com/package/n#specifying-nodejs-versions for the full documentation,
# Note that using of 'ddev nvm' is discouraged because "nodejs_version" is much easier to use,
# can specify any version, and is more robust than using 'nvm'.

# corepack_enable: false
# Change to 'true' to 'corepack enable' and gain access to latest versions of yarn/pnpm
Expand Down Expand Up @@ -202,13 +203,13 @@ corepack_enable: false

# disable_settings_management: false
# If true, DDEV will not create CMS-specific settings files like
# Drupal's settings.php/settings.ddev.php or TYPO3's AdditionalConfiguration.php
# Drupal's settings.php/settings.ddev.php or TYPO3's additional.php
# In this case the user must provide all such settings.

# You can inject environment variables into the web container with:
# web_environment:
# - SOMEENV=somevalue
# - SOMEOTHERENV=someothervalue
# - SOMEENV=somevalue
# - SOMEOTHERENV=someothervalue

# no_project_mount: false
# (Experimental) If true, DDEV will not mount the project into the web container;
Expand Down
18 changes: 9 additions & 9 deletions .tugboat/config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
php:
image: tugboatqa/php:8.2-apache
image: tugboatqa/php:8.3-apache
default: true
# Wait until the mysql service is done building
depends: mysql
Expand Down Expand Up @@ -42,7 +42,11 @@ services:
- find "${DOCROOT}/sites/default/files" -type f -exec chmod 0664 {} \;

# Install our standard installation
- cp "${TUGBOAT_ROOT}/install.sh" "${DOCROOT}" && cd "${DOCROOT}" && sh -x ./install.sh
- drush site-install --yes
- drush user:password admin admin
- drush user:role:add administrator admin
- drush config-set system.site uuid 28350631-bb36-48a0-a913-6d4998c3c9db --yes
- drush entity-delete shortcut_set --yes

# Commands that build the site. This is where you would add things
# like feature reverts or any other drush commands required to
Expand All @@ -51,15 +55,11 @@ services:
# and update steps, because the results of those are inherited
# from the base preview.
build:
- composer install --optimize-autoloader
#- drush updb --yes
#- drush cache:rebuild

# For now we just reinstall our standard installation
- cp "${TUGBOAT_ROOT}/install.sh" "${DOCROOT}" && cd "${DOCROOT}" && sh -x ./install.sh
- drush config-import --yes
- drush en dubbot_default_content --yes

# Warm the caches to get a quicker first page load.
- 'curl -H "Host: ${TUGBOAT_DEFAULT_SERVICE_URL_HOST}" http://localhost > /dev/null 2>&1'

mysql:
image: tugboatqa/mariadb:10.4
image: tugboatqa/mariadb:10.6
39 changes: 26 additions & 13 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,27 +18,35 @@
"require": {
"composer/installers": "^2.2",
"cweagans/composer-patches": "^1.7.3",
"drupal/core-composer-scaffold": "10.2.6",
"drupal/core-project-message": "10.2.6",
"drupal/core-recommended": "10.2.6",
"drupal/dubbot": "1.0.x-dev",
"drupal/core-composer-scaffold": "^11",
"drupal/core-recommended": "^11",
"drupal/core-vendor-hardening": "^11.0",
"drupal/dubbot": "2.x-dev",
"drupal/menu_link_config": "^1.0@alpha",
"drush/drush": "^12.5.2",
"drupal/tour": "^2.0",
"drush/drush": "^13",
"mglaman/composer-drupal-lenient": "^1.0",
"phpstan/phpstan-deprecation-rules": "^1.1.4"
},
"require-dev": {
"drupal/core-dev": "^11",
"drupal/upgrade_status": "^4.3"
},
"conflict": {
"drupal/drupal": "*"
},
"prefer-stable": true,
"config": {
"allow-plugins": {
"composer/installers": true,
"cweagans/composer-patches": true,
"dealerdirect/phpcodesniffer-composer-installer": true,
"drupal/core-composer-scaffold": true,
"drupal/core-project-message": true,
"drupal/core-vendor-hardening": true,
"mglaman/composer-drupal-lenient": true,
"php-http/discovery": true,
"phpstan/extension-installer": true,
"dealerdirect/phpcodesniffer-composer-installer": true,
"cweagans/composer-patches": true,
"php-http/discovery": true
"tbachert/spi": true
},
"sort-packages": true
},
Expand Down Expand Up @@ -82,11 +90,16 @@
"Provide a block for running cron from a dashboard": "https://www.drupal.org/files/issues/2022-12-17/3327827-block-cron.patch"
},
"drupal/menu_link_config": {
"Fatal error after upgrading to Drupal 10.2" : "https://www.drupal.org/files/issues/2024-01-11/3410136-fatal-error-after-upgrading-11.patch"
"Drupal 11 update (https://dgo.to/3431957)": "patches/drupal/menu_link_config/3431957-drupal-11.patch",
"Fatal error after upgrading to Drupal 10.2 (https://dgo.to/3410136)" : "patches/drupal/menu_link_config/3410136-fatal-error-after-upgrading-11.patch",
"Dynamic property declaration (https://dgo.to/3416766)": "patches/drupal/menu_link_config/dynamic-property-declaration-3416766-2.patch"
},
"drupal/dubbot": {
"Permissions to limit which reports appear (https://dgo.to/3484445)": "patches/drupal/dubbot/3484445-permissions.patch"
}
},
"drupal-lenient": {
"allowed-list": ["drupal/menu_link_config"]
}
},
"require-dev": {
"drupal/core-dev": "^10.2.6"
}
}
Loading
Loading