Merge branch 'release/1.10.0'

Author: richardgaunt

.ahoy.yml

@@ -184,6 +184,12 @@ commands:
       ahoy cli vendor/bin/rector --clear-cache
       ahoy cli vendor/bin/phpcbf
 
+  lint-govcms:
+    usage: Lint with shipshape.
+    cmd: |
+      ahoy cli sh -c "/usr/local/bin/shipshape -e"
+      ahoy cli vendor/bin/phpstan --configuration=/app/phpstan-govcms.neon
+
   test:
     usage: Run all tests.
     cmd: ahoy test-unit && ahoy test-kernel && ahoy test-functional && ahoy test-bdd
@@ -232,6 +238,20 @@ commands:
       ahoy confirm "Some committed files may become overwritten. Proceed?" &&
       ./scripts/drevops/update-drevops.sh $@
 
+  bump-uikit:
+    usage: Update CivicTheme UIKit to latest commit hash
+    cmd: |
+      export LATEST_UIKIT_HASH=$(curl -s https://api.github.com/repos/civictheme/uikit/commits/main | jq -r .sha)
+      sed -i 's|civictheme/uikit#[a-f0-9]\{40\}|civictheme/uikit#'$LATEST_UIKIT_HASH'|' package.json
+      sed -i 's|git+ssh://[email protected]/civictheme/uikit.git#[a-f0-9]\{40\}|git+ssh://[email protected]/civictheme/uikit.git#'$LATEST_UIKIT_HASH'|' package-lock.json
+      npm install
+      pushd web/themes/contrib/civictheme/
+      sed -i 's|civictheme/uikit#[a-f0-9]\{40\}|civictheme/uikit#'$LATEST_UIKIT_HASH'|' package.json
+      sed -i 's|civictheme/uikit#[a-f0-9]\{40\}|civictheme/uikit#'$LATEST_UIKIT_HASH'|' package-lock.json
+      npm install
+      popd
+      echo "Bumped to latest commit on uikit#main https://github.com/civictheme/uikit/commit/${LATEST_UIKIT_HASH}"
+
   local:
     usage: Custom local commands. See `ahoy local help`.
     cmd: |

.circleci/config.yml

@@ -65,6 +65,10 @@ aliases:
   - &runner_config
     # Location of checked-out files within "runner" container.
     working_directory: &working_directory ~/project
+    parameters:
+      shipshape_run_audit:
+        default: false
+        type: boolean
     environment:
       DREVOPS_DEPLOY_SSH_FINGERPRINT: *deploy_ssh_fingerprint
       DEPLOY_SSH_FINGERPRINT1: *deploy_ssh_fingerprint1
@@ -146,7 +150,9 @@ job-build-isolated: &job-build-isolated
           sudo pecl install pcov
           echo "extension=pcov.so" | sudo tee -a /usr/local/etc/php/conf.d/pcov.ini
           echo "pcov.enabled=1" | sudo tee -a /usr/local/etc/php/conf.d/pcov.ini
-
+    - run:
+        name: Install rsync
+        command: sudo apt-get update && sudo apt-get install -y rsync
     - run:
         name: Assemble the codebase
         command: .devtools/assemble.sh
@@ -269,6 +275,13 @@ job-build: &job-build
             docker compose exec -T cli php -d memory_limit=-1 vendor/bin/behat --colors --strict --rerun --profile="${DREVOPS_CI_BEHAT_PROFILE:-default}" || \
             [ "${DREVOPS_CI_BEHAT_IGNORE_FAILURE:-0}" -eq 1 ]
         no_output_timeout: 30m
+    # Optionally run Shipshape audit.
+    - when:
+        condition: << parameters.shipshape_run_audit >>
+        steps:
+          - run:
+              name: Audit code with shipshape
+              command: docker compose exec -T cli sh -c "/usr/local/bin/shipshape -e -o junit > /app/.logs/test_results/shipshape-results.xml" || [ "${DREVOPS_CI_SHIPSHAPE_IGNORE_FAILURE:-0}" -eq 1 ]
     - run:
         name: Process test logs and artifacts
         command: |
@@ -360,6 +373,10 @@ jobs:
   # GovCMS profile, no sub-theme.
   build-govcms:
     <<: *runner_config
+    parameters:
+      shipshape_run_audit:
+        default: true
+        type: boolean
     environment:
       DRUPAL_PROFILE: govcms
       CIVICTHEME_SUBTHEME_ACTIVATION_SKIP: 1
@@ -370,6 +387,10 @@ jobs:
   # GovCMS profile, sub-theme. Longest test run.
   build-govcms-subtheme:
     <<: *runner_config
+    parameters:
+      shipshape_run_audit:
+        default: true
+        type: boolean
     environment:
       DRUPAL_PROFILE: govcms
       DREVOPS_CI_DRUPAL_THEME_CONFIG_LINT_IGNORE_FAILURE: 1

.docker/cli.dockerfile

@@ -10,7 +10,7 @@
 # @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-cli-drupal
 #
 # hadolint global ignore=DL3018
-FROM uselagoon/php-8.3-cli-drupal:24.10.0
+FROM uselagoon/php-8.3-cli-drupal:25.1.0
 
 # Add missing variables.
 # @todo Remove once https://github.com/uselagoon/lagoon/issues/3121 is resolved.
@@ -45,7 +45,7 @@ ENV WEBROOT=${WEBROOT} \
 
 # Adding more tools.
 RUN apk update \
-    && apk add pv python3 make gcc g++ diffutils ncurses pv tzdata \
+    && apk add pv python3 make gcc g++ diffutils ncurses pv tzdata rsync \
     && ln -sf python3 /usr/bin/python \
     && rm -rf /var/cache/apk/*
 
@@ -63,6 +63,9 @@ RUN mkdir -p web/themes/contrib/civictheme \
     && mkdir -p web/modules/custom/civictheme_dev \
     && mkdir -p web/modules/custom/cs_generated_content
 
+# Add shipshape binary so that we can execute audits.
+COPY --from=ghcr.io/salsadigitalauorg/shipshape:latest /usr/local/bin/shipshape /usr/local/bin/shipshape
+
 # Copy files required for PHP dependencies resolution.
 # Note that composer.lock is not explicitly copied, allowing to run the stack
 # without existing lock file (this is not advisable, but allows to build

.docker/cli.onlytheme.dockerfile

@@ -9,7 +9,7 @@
 # @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-cli-drupal
 #
 # hadolint global ignore=DL3018
-FROM uselagoon/php-8.3-cli-drupal:24.10.0
+FROM uselagoon/php-8.3-cli-drupal:25.1.0
 
 # Add missing variables.
 # @todo Remove once https://github.com/uselagoon/lagoon/issues/3121 is resolved.
@@ -62,6 +62,9 @@ RUN mkdir -p web/themes/contrib/civictheme \
     && mkdir -p web/modules/custom/civictheme_dev \
     && mkdir -p web/modules/custom/cs_generated_content
 
+# Add shipshape binary so that we can execute audits.
+COPY --from=ghcr.io/salsadigitalauorg/shipshape:latest /usr/local/bin/shipshape /usr/local/bin/shipshape
+
 # Copy files required for PHP dependencies resolution.
 # Note that composer.lock is not explicitly copied, allowing to run the stack
 # without existing lock file (this is not advisable, but allows to build

.docker/cli.sibling.dockerfile

@@ -10,7 +10,7 @@
 # @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-cli-drupal
 #
 # hadolint global ignore=DL3018
-FROM uselagoon/php-8.3-cli-drupal:24.10.0
+FROM uselagoon/php-8.3-cli-drupal:25.1.0
 
 # Add missing variables.
 # @todo Remove once https://github.com/uselagoon/lagoon/issues/3121 is resolved.
@@ -63,6 +63,9 @@ RUN mkdir -p web/themes/contrib/civictheme \
     && mkdir -p web/modules/custom/civictheme_dev \
     && mkdir -p web/modules/custom/cs_generated_content
 
+# Add shipshape binary so that we can execute audits.
+COPY --from=ghcr.io/salsadigitalauorg/shipshape:latest /usr/local/bin/shipshape /usr/local/bin/shipshape
+
 # Copy files required for PHP dependencies resolution.
 # Note that composer.lock is not explicitly copied, allowing to run the stack
 # without existing lock file (this is not advisable, but allows to build

.docker/nginx-drupal.dockerfile

@@ -9,7 +9,7 @@ FROM ${CLI_IMAGE:-cli} as cli
 
 # @see https://hub.docker.com/r/uselagoon/nginx-drupal/tags?page=1
 # @see https://github.com/uselagoon/lagoon-images/tree/main/images/nginx-drupal
-FROM uselagoon/nginx-drupal:24.5.1
+FROM uselagoon/nginx-drupal:25.1.0
 
 # Webroot is used for Nginx docroot configuration.
 ARG WEBROOT=web

.docker/php.dockerfile

@@ -10,7 +10,7 @@ FROM ${CLI_IMAGE:-cli} as cli
 
 # @see https://hub.docker.com/r/uselagoon/php-8.3-fpm/tags
 # @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-fpm
-FROM uselagoon/php-8.3-fpm:24.10.0
+FROM uselagoon/php-8.3-fpm:25.1.0
 
 RUN apk add --no-cache tzdata
 

.gitignore

@@ -16,7 +16,6 @@ web/themes/*
 !web/themes/contrib/
 web/themes/contrib/*
 !web/themes/contrib/civictheme
-web/themes/contrib/civictheme/lib/uikit
 !web/themes/custom/
 web/themes/custom/*
 !web/themes/custom/.gitkeep

composer.json

@@ -6,11 +6,13 @@
         "php": ">=8.2",
         "composer/installers": "^2.1",
         "cweagans/composer-patches": "^1.7",
-        "drupal/core-composer-scaffold": "^10.3",
-        "drupal/core-project-message": "^10",
-        "drupal/core-recommended": "^10.3",
+        "drupal/core-composer-scaffold": "^11",
+        "drupal/core-project-message": "^11",
+        "drupal/core-recommended": "^11",
+        "drupal/mysql57": "^1.0",
         "drupal/search_api": "^1.30",
-        "drush/drush": "^12",
+        "drush/drush": "^13",
+        "mglaman/composer-drupal-lenient": "^1.0",
         "oomphinc/composer-installers-extender": "^2.0",
         "vlucas/phpdotenv": "^5.1",
         "webflo/drupal-finder": "^1.2",
@@ -19,13 +21,13 @@
     },
     "require-dev": {
         "behat/behat": "^3.10",
-        "behat/mink": "1.10",
-        "behat/mink-selenium2-driver": "1.6",
+        "behat/mink": "^1.12",
+        "behat/mink-selenium2-driver": "*",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7",
         "drevops/behat-format-progress-fail": "^1",
         "drevops/behat-screenshot": "^1",
         "drevops/behat-steps": "^2",
-        "drupal/core-dev": "^10.2",
+        "drupal/core-dev": "^11",
         "drupal/drupal-extension": "^5",
         "ergebnis/composer-normalize": "^2.42",
         "friendsoftwig/twigcs": "^6.2",
@@ -84,12 +86,13 @@
             "drupal/core-composer-scaffold": true,
             "drupal/core-project-message": true,
             "ergebnis/composer-normalize": true,
+            "mglaman/composer-drupal-lenient": true,
             "oomphinc/composer-installers-extender": true,
             "php-http/discovery": true,
             "phpstan/extension-installer": true,
             "pyrech/composer-changelogs": true,
-            "wikimedia/composer-merge-plugin": true,
-            "tbachert/spi": true
+            "tbachert/spi": true,
+            "wikimedia/composer-merge-plugin": true
         },
         "platform": {
             "php": "8.3.8"
@@ -161,7 +164,6 @@
             "replace": true,
             "require": [
                 "web/themes/contrib/civictheme/composer.json",
-                "web/modules/custom/civictheme_govcms/composer.json",
                 "web/modules/custom/civictheme_admin/composer.json",
                 "web/modules/custom/civictheme_content/composer.json",
                 "web/modules/custom/civictheme_dev/composer.json",
@@ -174,6 +176,12 @@
         "patches": {
             "drupal/core": {
                 "Builds failing on missing layout column plugin": "https://www.drupal.org/files/issues/2023-07-16/3204271-20-missing-layout-exception.patch"
+            },
+            "drupal/simple_sitemap": {
+                "Error on installing / enabling simple_sitemap in D11: https://www.drupal.org/project/simple_sitemap/issues/3507718": "./patches/modules/simple_sitemap/fix-error-on-install.patch"
+            },
+            "drupal/styleguide": {
+                "Create Drupal 11 test release: https://www.drupal.org/project/styleguide/issues/3505640": "https://git.drupalcode.org/project/styleguide/-/merge_requests/23.patch"
             }
         },
         "preserve-paths": [
@@ -190,7 +198,10 @@
             "web/sites/default/files",
             "web/robots.txt",
             "web/.htaccess"
-        ]
+        ],
+        "drupal-lenient": {
+            "allowed-list": ["drupal/styleguide"]
+        }
     },
     "scripts": {
         "pre-install-cmd": [