Move edge build to d10

.circleci/config.yml

@@ -68,9 +68,10 @@ commands:
       - run:
           name: Switch dof-dss packages to HEAD on development branch
           command: |
-            composer require dof-dss/nicsdru_unity_theme:dev-development \
-              dof-dss/nicsdru_origins_modules:dev-development \
-                dof-dss/nicsdru_unity_modules:dev-development
+            composer require dof-dss/nicsdru_unity_theme:dev-10.x-dev \
+              dof-dss/nicsdru_origins_modules:dev-10.x-dev \
+              dof-dss/nicsdru_unity_modules:dev-10.x-dev \
+              dof-dss/nicsdru_unity_profile:dev-10.x-dev
   install_psh_cli:
     description: "Install the Platform.sh CLI tool"
     steps:
@@ -168,6 +169,7 @@ jobs:
       GIT_AUTHOR_NAME: "Circle CI"
       EDGE_BUILD_BRANCH: "edge"
       PLATFORM_REGION: "uk-1.platform.sh"
+      CPPFLAGS: "-DPNG_ARM_NEON_OPT=0"
     steps:
       - hosts_keyscan
       - checkout_code
@@ -202,26 +204,15 @@ jobs:
             export NVM_DIR="$HOME/.nvm"
             [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
             [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
-            nvm install v15.14.0
-            for site in `ls -l ~/project/project/sites | grep ^d | awk '{print $9}'`
-            do
-              if [[ -d ~/project/project/sites/${site}/themes/${site}_theme ]]; then
-                echo "*** Building theme for ${site} ***"
-                cd ~/project/project/sites/${site}/themes/${site}_theme
-                sed -i -e "s/\"nicsdru_unity_theme.*/\"nicsdru_unity_theme\": \"github:dof-dss\/nicsdru_unity_theme#development\",/" package.json
-                npm install
-                npm rebuild node-sass
-                npm run build
-
-                git add *.css
-                git commit -m "Theme rebuild"
-              else
-                echo "No theme folder detected under ~/project/project/sites/${site}/themes/${site}_theme, skipping."
-              fi
-            done
+            nvm install v14.21.3
+            cd $PROJECT_ROOT
+            ./build-themes.sh --sites-dir $PROJECT_ROOT/project/sites
 
             # Push to fixed, non-integrating build branch. GitHub webhook integration will propagate this
             # to platform.sh for later steps to use.
+            cd $PROJECT_ROOT
+            git add *.css
+            git commit -m "Theme rebuild"
             git push -f origin $EDGE_BUILD_BRANCH
 
   # Separate task to allow us to sync data on PSH environments, without pauses in other jobs.
@@ -259,7 +250,7 @@ jobs:
             do
               result=$(platform drush "st -l ${site}" -y -p $PLATFORM_PROJECT -e $EDGE_BUILD_BRANCH | (grep "Drupal bootstrap : Successful" || true) )
               if [[ -n $result ]]; then
-                result2=$(platform drush "pml -l ${site}" -p $PLATFORM_PROJECT -e $EDGE_BUILD_BRANCH | (grep "Fastly (fastly)" || true) )
+                result2=$(platform drush "pml --status=enabled -l ${site}" -p $PLATFORM_PROJECT -e $EDGE_BUILD_BRANCH | (grep "Fastly (fastly)" || true) )
                 if [[ -n $result2 ]]; then
                   echo "***** Uninstall Fastly - ${site} *****"
                   platform drush "pmu fastly -l ${site}" -y -p $PLATFORM_PROJECT -e $EDGE_BUILD_BRANCH
@@ -342,9 +333,9 @@ workflows:
       - deprecated_code:
           requires:
             - build
-      - check_illegal_updates:
-          requires:
-            - build
+      #- check_illegal_updates:
+      #    requires:
+      #      - build
 
   # A nightly build of the project, using all dof-dss packages at HEAD from development branch.
   nightly-edge-build:

.lando.base.yml

@@ -0,0 +1,175 @@
+name: unity_base
+recipe: drupal9
+config:
+  webroot: web
+  database: mariadb
+  php: '8.1'
+  composer_version: '2.5.8'
+  config:
+    php: .lando/config/php.ini
+    database: .lando/config/my.cnf
+compose:
+  - docker-compose.yml
+env_file:
+  - .env
+services:
+  appserver:
+    scanner: false
+    overrides:
+      environment:
+        CPPFLAGS: "-DPNG_ARM_NEON_OPT=0"
+    xdebug: debug
+    build_as_root:
+      - /app/.lando/scripts/appserver_build.sh
+  database:
+    build_as_root:
+      - "sh /app/.lando/scripts/create_databases.sh"
+  redis:
+    type: redis:5.0
+    persist: true
+    config:
+      server: .lando/config/redis.conf
+  mailhog:
+    type: mailhog
+    portforward: true
+    hogfrom:
+      - appserver
+tooling:
+  drupal:
+    cmd: "/app/vendor/bin/drupal --root=/app/web"
+  xdebug-on:
+    service: appserver
+    description: Enable xdebug
+    cmd: "docker-php-ext-enable xdebug && /etc/init.d/apache2 reload"
+    user: root
+  xdebug-off:
+    service: appserver
+    description: Disable xdebug
+    cmd: "rm /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && /etc/init.d/apache2 reload"
+    user: root
+  npm:
+    service: appserver
+    cmd: /usr/bin/npm
+  yarn:
+    service: appserver
+    cmd: yarn
+  'nightwatch [site] [test]':
+    service: appserver
+    description: "Run Nightwatch.js functional tests.\n\n
+                      Usage:\n
+                      > Run a specific test with tag\n
+                      lando nightwatch <site> --tag your-tag\n
+                      > Run a single test suite file, relative to Drupal core location\n
+                      lando nightwatch <site> ../modules/custom/modulename/tests/src/Nightwatch/Tests/yourTestSuite.js\n
+                      > Run all tests except Core\n
+                      lando nightwatch <site> --skiptags core\n"
+    cmd: "sh /app/.lando/scripts/run_nightwatch.sh"
+    options:
+      site:
+        passthrough: true
+        description: Multisite to run tests on
+        alias:
+          - s
+        interactive:
+          type: input
+          message: Which Unity site (e.g. uregni) ?
+          weight: 1
+      test:
+        passthrough: true
+  phpunit:
+    description: "Run PHPUnit tests. You can pass options, e.g. --group=unity, as you require"
+    service: appserver
+    cmd: cd /app/web/core && /app/vendor/bin/phpunit -c /app/web/core/phpunit.xml
+  phpcs:
+    description: Run PHPCS checks against all custom Drupal 8 code
+    service: appserver
+    cmd: /app/phpcs.sh "/app" "/app/web/sites /app/web/modules/origins /app/web/modules/custom /app/web/themes/custom /app/web/profiles/unity"
+  drck:
+    description: Run drupal-check for Drupal 9 compatibility e.g. 'lando drck ./'
+    service: appserver
+    cmd: /app/vendor/bin/drupal-check
+  drush:
+    server: appserver
+    cmd: drush -r /app/web
+  'db-export [file]': disabled
+  'db-import <file>': disabled
+  'db-export [name]':
+    service: database
+    description: Exports database to a file. To export all databases, don't provide the name'
+    cmd: "sh /app/.lando/scripts/export_database.sh"
+    user: root
+    options:
+      name:
+        description: Database to export
+        alias:
+          - n
+  'db-import [database] [file]':
+    service: database
+    description: Import file to database
+    cmd: "sh /app/.lando/scripts/import_database.sh"
+    user: root
+    options:
+      database:
+        passthrough: true
+        description: Database to import to
+        alias:
+          - d
+        interactive:
+          type: input
+          message: Which database to import to?
+          weight: 1
+      file:
+        passthrough: true
+        description: File to import
+        alias:
+          - f
+        interactive:
+          type: input
+          message: Which file to import?
+          weight: 2
+  'db-create [name]':
+    service: database
+    description: Create a new database
+    cmd: "sh /app/.lando/scripts/create_database.sh"
+    user: root
+    options:
+      name:
+        passthrough: true
+        description: Name of the database to create
+        alias:
+          - n
+        interactive:
+          type: input
+          message: What do you want to call this database?
+          weight: 1
+  'db-delete [name]':
+    service: database
+    description: Delete a database
+    cmd: "sh /app/.lando/scripts/delete_database.sh"
+    user: root
+    options:
+      name:
+        passthrough: true
+        description: Name of the database to delete
+        alias:
+          - n
+        interactive:
+          type: input
+          message: Which database do you want to delete?
+          weight: 1
+  db-list:
+    service: database
+    description: List all databases
+    cmd: mysql -uroot -e "SHOW DATABASES;"
+    user: root
+  rebuild-unity-site-themes:
+    service: appserver
+    description: "Re-builds the Unity themes for each sites. Examples:\n\n
+            > Rebuild all site themes\n
+              lando rebuild-unity-site-themes\n
+            > Rebuild single site theme\n
+              lando rebuild-unity-site-themes --site-names octf\n
+            > Rebuild site themes specified - comma separated\n
+              lando rebuild-unity-site-themes --site-names octf,pbni"
+    cmd: "/app/build-themes.sh"
+

.lando/config/my.cnf

@@ -0,0 +1,4 @@
+[mysqld]
+max_allowed_packet=32M
+innodb_locks_unsafe_for_binlog = 1
+transaction-isolation=REPEATABLE-READ

.lando/config/php.ini

@@ -0,0 +1,45 @@
+[PHP]
+
+;;;;;;;;;;;;;;;
+; PHP Globals ;
+;;;;;;;;;;;;;;;
+
+short_open_tag = Off
+output_buffering = 4096
+allow_call_time_pass_reference = Off
+request_order = "GP"
+register_long_arrays = Off
+register_argc_argv = Off
+magic_quotes_gpc = Off
+enable_dl = Off
+allow_url_fopen = On
+realpath_cache_size = "800K"
+realpath_cache_ttl = "86400"
+disable_functions =
+sendmail_path=/bin/true
+
+[Date]
+date.timezone = "UTC"
+
+;;;;;;;;;;;;;;;;;;;;;;
+;; PACKAGE SETTINGS ;;
+;;;;;;;;;;;;;;;;;;;;;;
+
+; Xdebug
+xdebug.start_with_request=yes
+xdebug.max_nesting_level = 512
+xdebug.client_host="${LANDO_HOST_IP}"
+
+; Globals
+expose_php = on
+max_execution_time = 180
+max_input_time = 900
+max_input_vars = 10000
+memory_limit = -1
+upload_max_filesize = 100M
+post_max_size = 200M
+error_reporting = E_ALL & ~E_DEPRECATED
+ignore_repeated_errors = on
+html_errors = off
+display_errors = on
+log_errors = on

.lando/config/redis.conf

@@ -0,0 +1,3 @@
+databases 17
+maxmemory 64mb
+maxmemory-policy volatile-lru