From c0d4471f38a9c01d43cf8232aa41f0ace7132b1c Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Tue, 5 Sep 2023 16:26:26 +0100 Subject: [PATCH 01/11] Use Drupal 10 and LocalGov Microsites 3.x --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 1fff6b2..aea5642 100644 --- a/composer.json +++ b/composer.json @@ -22,10 +22,10 @@ "require": { "composer/installers": "^1.12", "cweagans/composer-patches": "^1.7", - "drupal/core-composer-scaffold": "^9.3", - "drupal/core-recommended": "^9.3", + "drupal/core-composer-scaffold": "^10.0", + "drupal/core-recommended": "^10.", "drush/drush": "^11.5", - "localgovdrupal/localgov_microsites": "^2.1.0-beta6" + "localgovdrupal/localgov_microsites": "3.x-dev" }, "require-dev": { "brianium/paratest": "^6.3", From b435e89a69f6ba7cb2d38ec1a773ae36e9906919 Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Tue, 5 Sep 2023 16:53:37 +0100 Subject: [PATCH 02/11] Updated requirements for Drupal 10 --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index aea5642..733ca11 100644 --- a/composer.json +++ b/composer.json @@ -22,14 +22,14 @@ "require": { "composer/installers": "^1.12", "cweagans/composer-patches": "^1.7", - "drupal/core-composer-scaffold": "^10.0", - "drupal/core-recommended": "^10.", - "drush/drush": "^11.5", + "drupal/core-composer-scaffold": "^10.0@stable", + "drupal/core-recommended": "^10.0@stable", + "drush/drush": "^12.0", "localgovdrupal/localgov_microsites": "3.x-dev" }, "require-dev": { "brianium/paratest": "^6.3", - "drupal/core-dev": "^9.3", + "drupal/core-dev": "^10.0", "mglaman/phpstan-drupal": "^1.1", "phpspec/prophecy-phpunit": "^2", "phpstan/phpstan": "^1.5", From 52fcc3a5e0f74025ff47cfb947dffd4518b65041 Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Fri, 8 Sep 2023 14:53:31 +0100 Subject: [PATCH 03/11] Removed phpstan includes now we're using the extension-installer --- phpstan.neon | 3 --- 1 file changed, 3 deletions(-) diff --git a/phpstan.neon b/phpstan.neon index 021caa8..8168a38 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -7,6 +7,3 @@ parameters: - '#Plugin definitions cannot be altered.#' - '#Missing cache backend declaration for performance.#' - '#Plugin manager has cache backend specified but does not declare cache tags.#' -includes: - - vendor/mglaman/phpstan-drupal/extension.neon - - vendor/phpstan/phpstan-deprecation-rules/rules.neon From 22dd672a7cd9aa78eed21fdc22604f4f7704af9f Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Fri, 8 Sep 2023 14:58:07 +0100 Subject: [PATCH 04/11] Run github tests against 3.x branch and Druapl 10 --- .github/workflows/localgov_microsites.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/localgov_microsites.yml b/.github/workflows/localgov_microsites.yml index 3800221..ed1d08c 100644 --- a/.github/workflows/localgov_microsites.yml +++ b/.github/workflows/localgov_microsites.yml @@ -6,10 +6,10 @@ name: Test LocalGov Microsites localgovdrupal/localgov_microsites_project projec on: push: branches: - - '2.x' + - '3.x' pull_request: branches: - - '2.x' + - '3.x' env: LOCALGOV_DRUPAL_PROJECT: localgovdrupal/localgov_microsites_project @@ -25,9 +25,9 @@ jobs: fail-fast: false matrix: localgov-version: - - '2.x' + - '3.x' drupal-version: - - '~9.3' + - '~10.0' php-version: - '8.1' @@ -88,9 +88,9 @@ jobs: fail-fast: false matrix: localgov-version: - - '2.x' + - '3.x' drupal-version: - - '~9.3' + - '~10.0' php-version: - '8.1' @@ -123,9 +123,9 @@ jobs: fail-fast: false matrix: localgov-version: - - '2.x' + - '3.x' drupal-version: - - '~9.3' + - '~10.0' php-version: - '8.1' @@ -157,9 +157,9 @@ jobs: fail-fast: false matrix: localgov-version: - - '2.x' + - '3.x' drupal-version: - - '~9.3' + - '~10.0' php-version: - '8.1' From 46ea9519e3bd2b94fddcd18687eebda779b75b1c Mon Sep 17 00:00:00 2001 From: Finn Lewis Date: Fri, 8 Sep 2023 15:19:57 +0100 Subject: [PATCH 05/11] Add default ddev config. --- .ddev/commands/web/phix | 7 + .ddev/commands/web/phpcs | 7 + .ddev/commands/web/phpstan | 7 + .ddev/commands/web/phpunit | 7 + .ddev/config.selenium-standalone-chrome.yaml | 25 +++ .ddev/config.yaml | 214 +++++++++++++++++++ .ddev/docker-compose.selenium-chrome.yaml | 30 +++ 7 files changed, 297 insertions(+) create mode 100755 .ddev/commands/web/phix create mode 100755 .ddev/commands/web/phpcs create mode 100755 .ddev/commands/web/phpstan create mode 100755 .ddev/commands/web/phpunit create mode 100644 .ddev/config.selenium-standalone-chrome.yaml create mode 100644 .ddev/config.yaml create mode 100644 .ddev/docker-compose.selenium-chrome.yaml diff --git a/.ddev/commands/web/phix b/.ddev/commands/web/phix new file mode 100755 index 0000000..c1d3e06 --- /dev/null +++ b/.ddev/commands/web/phix @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +## Description: Run phpcbf to automatically fix some phpcs errors. +## Usage: phix +## Example: "ddev phix" + +/var/www/html/bin/phpcbf $* diff --git a/.ddev/commands/web/phpcs b/.ddev/commands/web/phpcs new file mode 100755 index 0000000..90303a2 --- /dev/null +++ b/.ddev/commands/web/phpcs @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +## Description: Run phpcs in the web container. +## Usage: phpcs +## Example: "ddev phpcs" + +/var/www/html/bin/phpcs -p $* \ No newline at end of file diff --git a/.ddev/commands/web/phpstan b/.ddev/commands/web/phpstan new file mode 100755 index 0000000..665b226 --- /dev/null +++ b/.ddev/commands/web/phpstan @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +## Description: Run PHPSTAN to report on code deprecations. +## Usage: phpix +## Example: "ddev phix" + +/var/www/html/bin/phpstan $* \ No newline at end of file diff --git a/.ddev/commands/web/phpunit b/.ddev/commands/web/phpunit new file mode 100755 index 0000000..30b0274 --- /dev/null +++ b/.ddev/commands/web/phpunit @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +## Description: Run phpunit in the web container to run phpunit tests. +## Usage: phpunit +## Example: "ddev phpunit" + +/var/www/html/bin/phpunit $* \ No newline at end of file diff --git a/.ddev/config.selenium-standalone-chrome.yaml b/.ddev/config.selenium-standalone-chrome.yaml new file mode 100644 index 0000000..e2c7d1c --- /dev/null +++ b/.ddev/config.selenium-standalone-chrome.yaml @@ -0,0 +1,25 @@ +# This file comes from https://github.com/ddev/ddev-selenium-standalone-chrome +# +web_environment: + - BROWSERTEST_OUTPUT_DIRECTORY=/tmp + - BROWSERTEST_OUTPUT_BASE_URL=${DDEV_PRIMARY_URL} + - SIMPLETEST_BASE_URL=http://web + - SIMPLETEST_DB=mysql://db:db@db/db + # Use disable-dev-shm-usage instead of setting shm_usage + # https://developers.google.com/web/tools/puppeteer/troubleshooting#tips + # The format of chromeOptions is defined at https://chromedriver.chromium.org/capabilities + - MINK_DRIVER_ARGS_WEBDRIVER=[\"chrome\", {\"browserName\":\"chrome\",\"chromeOptions\":{\"w3c\":false,\"args\":[\"--disable-gpu\",\"--headless\", \"--no-sandbox\", \"--disable-dev-shm-usage\"]}}, \"http://selenium-chrome:4444/wd/hub\"] + # Nightwatch + - DRUPAL_TEST_BASE_URL=http://web + - DRUPAL_TEST_DB_URL=mysql://db:db@db/db + - DRUPAL_TEST_WEBDRIVER_HOSTNAME=selenium-chrome + - DRUPAL_TEST_WEBDRIVER_PORT=4444 + - DRUPAL_TEST_WEBDRIVER_PATH_PREFIX=/wd/hub + - DRUPAL_TEST_WEBDRIVER_CHROME_ARGS=--disable-gpu --headless --no-sandbox --disable-dev-shm-usage + - DRUPAL_TEST_CHROMEDRIVER_AUTOSTART=false + - DRUPAL_NIGHTWATCH_SEARCH_DIRECTORY=../ + - DRUPAL_NIGHTWATCH_IGNORE_DIRECTORIES=node_modules,vendor,.*,sites/*/files,sites/*/private,sites/simpletest + - DRUPAL_NIGHTWATCH_OUTPUT=reports/nightwatch + # DTT + - DTT_BASE_URL=http://web + - DTT_MINK_DRIVER_ARGS=[\"chrome\", {\"browserName\":\"chrome\",\"chromeOptions\":{\"w3c\":false,\"args\":[\"--disable-gpu\",\"--headless\", \"--no-sandbox\", \"--disable-dev-shm-usage\"]}}, \"http://selenium-chrome:4444/wd/hub\"] diff --git a/.ddev/config.yaml b/.ddev/config.yaml new file mode 100644 index 0000000..315b64d --- /dev/null +++ b/.ddev/config.yaml @@ -0,0 +1,214 @@ +name: localgov-microsites +type: drupal10 +docroot: web +php_version: "8.1" +webserver_type: nginx-fpm +router_http_port: "80" +router_https_port: "443" +xdebug_enabled: false +additional_hostnames: [ + localgov-micro, + localgov-micro-1, + localgov-micro-2, + localgov-micro-3, + localgov-micro-4, + localgov-micro-5 +] +additional_fqdns: [] +database: + type: mariadb + version: "10.3" +nfs_mount_enabled: false +mutagen_enabled: false +use_dns_when_possible: true +composer_version: "" +web_environment: [] +nodejs_version: "16" + +# Key features of ddev's config.yaml: + +# name: # Name of the project, automatically provides +# http://projectname.ddev.site and https://projectname.ddev.site + +# type: # drupal6/7/8, backdrop, typo3, wordpress, php + +# docroot: # Relative path to the directory containing index.php. + +# php_version: "7.4" # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1" + +# You can explicitly specify the webimage but this +# is not recommended, as the images are often closely tied to ddev's' behavior, +# so this can break upgrades. + +# webimage: # nginx/php docker image. + +# database: +# type: # mysql, mariadb +# version: # database version, like "10.3" or "8.0" +# Note that mariadb_version or mysql_version from v1.18 and earlier +# will automatically be converted to this notation with just a "ddev config --auto" + +# router_http_port: # Port to be used for http (defaults to port 80) +# router_https_port: # Port for https (defaults to 443) + +# xdebug_enabled: false # Set to true to enable xdebug and "ddev start" or "ddev restart" +# Note that for most people the commands +# "ddev xdebug" to enable xdebug and "ddev xdebug off" to disable it work better, +# as leaving xdebug enabled all the time is a big performance hit. + +# xhprof_enabled: false # Set to true to enable xhprof and "ddev start" or "ddev restart" +# Note that for most people the commands +# "ddev xhprof" to enable xhprof and "ddev xhprof off" to disable it work better, +# as leaving xhprof enabled all the time is a big performance hit. + +# webserver_type: nginx-fpm # or apache-fpm + +# timezone: Europe/Berlin +# 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 +# For example Europe/Dublin or MST7MDT + +# composer_root: +# Relative path to the composer root directory from the project root. This is +# the directory which contains the composer.json and where all Composer related +# commands are executed. + +# composer_version: "2" +# if composer_version:"2" it will use the most recent composer v2 +# It can also be set to "1", to get most recent composer v1 +# or "" for the default v2 created at release time. +# It can be set to any existing specific composer version. +# After first project 'ddev start' this will not be updated until it changes + +# nodejs_version: "16" +# change from the default system Node.js version to another supported version, like 12, 14, 17. +# Note that you can use 'ddev nvm' or nvm inside the web container to provide nearly any +# Node.js version, including v6, etc. + +# additional_hostnames: +# - somename +# - someothername +# would provide http and https URLs for "somename.ddev.site" +# and "someothername.ddev.site". + +# additional_fqdns: +# - example.com +# - sub1.example.com +# would provide http and https URLs for "example.com" and "sub1.example.com" +# Please take care with this because it can cause great confusion. + +# upload_dir: custom/upload/dir +# would set the destination path for ddev import-files to /custom/upload/dir + +# working_dir: +# web: /var/www/html +# db: /home +# would set the default working directory for the web and db services. +# These values specify the destination directory for ddev ssh and the +# directory in which commands passed into ddev exec are run. + +# omit_containers: [db, dba, ddev-ssh-agent] +# Currently only these containers are supported. Some containers can also be +# omitted globally in the ~/.ddev/global_config.yaml. Note that if you omit +# the "db" container, several standard features of ddev that access the +# database container will be unusable. In the global configuration it is also +# possible to omit ddev-router, but not here. + +# nfs_mount_enabled: false +# Great performance improvement but requires host configuration first. +# See https://ddev.readthedocs.io/en/stable/users/performance/#using-nfs-to-mount-the-project-into-the-container + +# mutagen_enabled: false +# Experimental performance improvement using mutagen asynchronous updates. +# See https://ddev.readthedocs.io/en/latest/users/performance/#using-mutagen + +# fail_on_hook_fail: False +# Decide whether 'ddev start' should be interrupted by a failing hook + +# host_https_port: "59002" +# The host port binding for https can be explicitly specified. It is +# dynamic unless otherwise specified. +# This is not used by most people, most people use the *router* instead +# of the localhost port. + +# host_webserver_port: "59001" +# The host port binding for the ddev-webserver can be explicitly specified. It is +# dynamic unless otherwise specified. +# This is not used by most people, most people use the *router* instead +# of the localhost port. + +# host_db_port: "59002" +# The host port binding for the ddev-dbserver can be explicitly specified. It is dynamic +# unless explicitly specified. + +# phpmyadmin_port: "8036" +# phpmyadmin_https_port: "8037" +# The PHPMyAdmin ports can be changed from the default 8036 and 8037 + +# host_phpmyadmin_port: "8036" +# The phpmyadmin (dba) port is not normally bound on the host at all, instead being routed +# through ddev-router, but it can be specified and bound. + +# mailhog_port: "8025" +# mailhog_https_port: "8026" +# The MailHog ports can be changed from the default 8025 and 8026 + +# host_mailhog_port: "8025" +# The mailhog port is not normally bound on the host at all, instead being routed +# through ddev-router, but it can be bound directly to localhost if specified here. + +# webimage_extra_packages: [php7.4-tidy, php-bcmath] +# Extra Debian packages that are needed in the webimage can be added here + +# dbimage_extra_packages: [telnet,netcat] +# Extra Debian packages that are needed in the dbimage can be added here + +# use_dns_when_possible: true +# If the host has internet access and the domain configured can +# successfully be looked up, DNS will be used for hostname resolution +# instead of editing /etc/hosts +# Defaults to true + +# project_tld: ddev.site +# The top-level domain used for project URLs +# The default "ddev.site" allows DNS lookup via a wildcard +# If you prefer you can change this to "ddev.local" to preserve +# pre-v1.9 behavior. + +# ngrok_args: --subdomain mysite --auth username:pass +# Provide extra flags to the "ngrok http" command, see +# https://ngrok.com/docs#http or run "ngrok http -h" + +# 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 +# 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 + +# no_project_mount: false +# (Experimental) If true, ddev will not mount the project into the web container; +# the user is responsible for mounting it manually or via a script. +# This is to enable experimentation with alternate file mounting strategies. +# For advanced users only! + +# bind_all_interfaces: false +# If true, host ports will be bound on all network interfaces, +# not just the localhost interface. This means that ports +# will be available on the local network if the host firewall +# allows it. + +# Many ddev commands can be extended to run tasks before or after the +# ddev command is executed, for example "post-start", "post-import-db", +# "pre-composer", "post-composer" +# See https://ddev.readthedocs.io/en/stable/users/extending-commands/ for more +# information on the commands that can be extended and the tasks you can define +# for them. Example: +#hooks: +# post-import-db: +# - exec: drush cr +# - exec: drush updb diff --git a/.ddev/docker-compose.selenium-chrome.yaml b/.ddev/docker-compose.selenium-chrome.yaml new file mode 100644 index 0000000..d85d29a --- /dev/null +++ b/.ddev/docker-compose.selenium-chrome.yaml @@ -0,0 +1,30 @@ +# This file comes from https://github.com/ddev/ddev-selenium-standalone-chrome +# +version: '3.6' +services: + selenium-chrome: + image: seleniarm/standalone-chromium:4.1.4-20220429 + container_name: ddev-${DDEV_SITENAME}-selenium-chrome + expose: + # The internal noVNC port, which operates over HTTP so it can be exposed + # through the router. + - 7900 + environment: + - VIRTUAL_HOST=$DDEV_HOSTNAME + - HTTPS_EXPOSE=7900:7900 + - HTTP_EXPOSE=7910:7900 + external_links: + - ddev-router:${DDEV_SITENAME}.${DDEV_TLD} + # To enable VNC access for traditional VNC clients like macOS "Screen Sharing", + # uncomment the following two lines. + #ports: + # - "5900:5900" + labels: + com.ddev.site-name: ${DDEV_SITENAME} + com.ddev.approot: $DDEV_APPROOT + volumes: + - ".:/mnt/ddev_config" + + web: + links: + - selenium-chrome From 5ab06d5504bcc01cd005f3ff34f8babbaf40b123 Mon Sep 17 00:00:00 2001 From: Finn Lewis Date: Fri, 8 Sep 2023 16:19:38 +0100 Subject: [PATCH 06/11] Fix deprecation warnings about including multiple extension.neon files. --- phpstan.neon | 3 --- 1 file changed, 3 deletions(-) diff --git a/phpstan.neon b/phpstan.neon index 021caa8..8168a38 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -7,6 +7,3 @@ parameters: - '#Plugin definitions cannot be altered.#' - '#Missing cache backend declaration for performance.#' - '#Plugin manager has cache backend specified but does not declare cache tags.#' -includes: - - vendor/mglaman/phpstan-drupal/extension.neon - - vendor/phpstan/phpstan-deprecation-rules/rules.neon From 498f9a2fb515f33642e93089fe50fe33647d4068 Mon Sep 17 00:00:00 2001 From: Lee Mills <8024370+millnut@users.noreply.github.com> Date: Mon, 25 Sep 2023 17:10:54 +0100 Subject: [PATCH 07/11] refactor: lando quality improvements --- .lando.dist.yml | 19 ++++++++++++++----- assets/composer/settings.lando.php | 15 ++++++++++----- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/.lando.dist.yml b/.lando.dist.yml index 726f26b..8bc78f4 100644 --- a/.lando.dist.yml +++ b/.lando.dist.yml @@ -1,7 +1,6 @@ name: localgov-micro recipe: drupal9 config: - xdebug: false webroot: web php: '8.1' proxy: @@ -27,6 +26,13 @@ proxy: - group-b3.appserver services: appserver: + xdebug: true + scanner: + retry: 5 + build_as_root: + # This disables Xdebug during build, but puts all dependencies in place + # ready for the tooling to enable Xdebug. + - rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && /etc/init.d/apache2 reload overrides: environment: DRUSH_OPTIONS_ROOT: '/app/web' @@ -35,6 +41,9 @@ services: MINK_DRIVER_ARGS_WEBDRIVER: '["chrome", { "chromeOptions": { "w3c": false } }, "http://chromedriver:4444/wd/hub"]' BROWSERTEST_OUTPUT_DIRECTORY: '/app/web/sites/simpletest/browser_output' BROWSERTEST_OUTPUT_BASE_URL: 'https://localgov-micro.lndo.site' + # Support debugging CLI with Xdebug. + PHP_IDE_CONFIG: "serverName=appserver" + XDEBUG_SESSION: "lando" build: - mkdir -p web/sites/simpletest/browser_output database: @@ -86,11 +95,11 @@ tooling: cmd: '/app/bin/phpunit --testdox' xdebug-on: service: appserver - description: Enable xdebug for apache. - cmd: "docker-php-ext-enable xdebug && /etc/init.d/apache2 reload" + description: Enable Xdebug for Apache. + cmd: rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && docker-php-ext-enable xdebug && /etc/init.d/apache2 reload && echo "Xdebug enabled" user: root xdebug-off: service: appserver - description: Disable xdebug for apache. - cmd: "rm /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && /etc/init.d/apache2 reload" + description: Disable Xdebug for Apache. + cmd: rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && /etc/init.d/apache2 reload && echo "Xdebug disabled" user: root diff --git a/assets/composer/settings.lando.php b/assets/composer/settings.lando.php index bfbf609..e5690b8 100644 --- a/assets/composer/settings.lando.php +++ b/assets/composer/settings.lando.php @@ -130,15 +130,20 @@ */ $settings['skip_permissions_hardening'] = TRUE; +/** + * Get Lando info + */ +$lando_info = json_decode(getenv('LANDO_INFO'), TRUE); + /** * Lando database credentials. */ $databases['default']['default'] = array ( - 'database' => 'database', - 'username' => 'database', - 'password' => 'database', - 'host' => 'database', - 'port' => '3306', + 'database' => $lando_info['database']['creds']['database'], + 'username' => $lando_info['database']['creds']['user'], + 'password' => $lando_info['database']['creds']['password'], + 'host' => $lando_info['database']['internal_connection']['host'], + 'port' => $lando_info['database']['internal_connection']['port'], 'driver' => 'mysql', 'prefix' => '', 'collation' => 'utf8mb4_general_ci', From f46897804bd4b7f47f3d91aac9e00c3e9183f7a6 Mon Sep 17 00:00:00 2001 From: Lee Mills <8024370+millnut@users.noreply.github.com> Date: Mon, 25 Sep 2023 17:14:52 +0100 Subject: [PATCH 08/11] ci: add PHP 8.2 support --- .github/workflows/localgov_microsites.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/localgov_microsites.yml b/.github/workflows/localgov_microsites.yml index ed1d08c..9b3517b 100644 --- a/.github/workflows/localgov_microsites.yml +++ b/.github/workflows/localgov_microsites.yml @@ -1,5 +1,5 @@ ## -# Managed by https://github.com/localgovdrupal/github_workflow_manager +# Managed by https://github.com/localgovdrupal/github_workflow_manager --- name: Test LocalGov Microsites localgovdrupal/localgov_microsites_project project @@ -13,7 +13,7 @@ on: env: LOCALGOV_DRUPAL_PROJECT: localgovdrupal/localgov_microsites_project - LOCALGOV_DRUPAL_PROJECT_PATH: + LOCALGOV_DRUPAL_PROJECT_PATH: jobs: @@ -30,6 +30,7 @@ jobs: - '~10.0' php-version: - '8.1' + - '8.2' steps: @@ -93,6 +94,7 @@ jobs: - '~10.0' php-version: - '8.1' + - '8.2' steps: @@ -128,6 +130,7 @@ jobs: - '~10.0' php-version: - '8.1' + - '8.2' steps: @@ -162,6 +165,7 @@ jobs: - '~10.0' php-version: - '8.1' + - '8.2' steps: From db1b4aaf35afec5703a1a08aee991f6fb157d489 Mon Sep 17 00:00:00 2001 From: Lee Mills <8024370+millnut@users.noreply.github.com> Date: Mon, 25 Sep 2023 17:46:47 +0100 Subject: [PATCH 09/11] refactor: lando quality improvements --- assets/composer/settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/composer/settings.php b/assets/composer/settings.php index a85db6e..41e56d8 100644 --- a/assets/composer/settings.php +++ b/assets/composer/settings.php @@ -770,6 +770,6 @@ if (file_exists($app_root . '/' . $site_path . '/settings.local.php')) { include $app_root . '/' . $site_path . '/settings.local.php'; } -elseif (file_exists($app_root . '/' . $site_path . '/settings.lando.php')) { +elseif (getenv('LANDO_SERVICE_NAME') == 'appserver' && file_exists($app_root . '/' . $site_path . '/settings.lando.php')) { include $app_root . '/' . $site_path . '/settings.lando.php'; } From 4148ba4e3a4908218cf23cf0b7b1df5298f6b624 Mon Sep 17 00:00:00 2001 From: Lee Mills <8024370+millnut@users.noreply.github.com> Date: Mon, 25 Sep 2023 18:10:00 +0100 Subject: [PATCH 10/11] refactor: lando quality improvements --- .lando.dist.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.lando.dist.yml b/.lando.dist.yml index 8bc78f4..90f6cb7 100644 --- a/.lando.dist.yml +++ b/.lando.dist.yml @@ -1,5 +1,5 @@ name: localgov-micro -recipe: drupal9 +recipe: drupal10 config: webroot: web php: '8.1' From 4c6ab93b297ac3ec6bc8a88fdf2d82bd88384fc6 Mon Sep 17 00:00:00 2001 From: Finn Lewis Date: Mon, 2 Oct 2023 16:23:24 +0100 Subject: [PATCH 11/11] Update localgov_microsites to 3.0.0-alpha1 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 733ca11..b7a29ab 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "drupal/core-composer-scaffold": "^10.0@stable", "drupal/core-recommended": "^10.0@stable", "drush/drush": "^12.0", - "localgovdrupal/localgov_microsites": "3.x-dev" + "localgovdrupal/localgov_microsites": "^3.0.0-alpha1" }, "require-dev": { "brianium/paratest": "^6.3",