Merge branch 'develop' into release-versions/v1.5.0

.docksal/docksal.env

@@ -1,4 +1,4 @@
 DOCKSAL_STACK=default
 DOCROOT=html
-DB_IMAGE="docksal/mysql:8.0-2.0"
-CLI_IMAGE="docksal/cli:php8.1-3.2"
+DB_IMAGE="docksal/mariadb:10.6"
+CLI_IMAGE="docksal/cli:php8.2"

.github/tests/docker-compose.yml

@@ -22,7 +22,7 @@ services:
       - default
 
   mysql:
-    image: public.ecr.aws/unocha/mysql:10.6
+    image: public.ecr.aws/unocha/mysql:10.11
     hostname: ghi-test-mysql
     container_name: ghi-test-mysql
     environment:
@@ -73,4 +73,4 @@ services:
     ports:
     - "8081:80"
     networks:
-      - default
+      - default

.github/workflows/composer-update.yml

@@ -3,6 +3,7 @@ name: Run Composer Update
 on:
   schedule:
     - cron: '40 7 * * 4'
+  workflow_dispatch:
 
 jobs:
   build:

.github/workflows/run-tests.yml

@@ -1,7 +1,7 @@
 name: Run tests
 
 on: [pull_request]
-  
+
 jobs:
   tests:
     runs-on: ubuntu-latest
@@ -11,19 +11,19 @@ jobs:
       pull-requests: write 
       actions: read 
       statuses: write 
-  
+
     steps:
       - name: Checkout Code
         id: checkout
         uses: actions/checkout@v3
-        
+
       - name: Extract PHP Version
         id: php
         uses: docker://ghcr.io/un-ocha/actions:extract-php-version-main
         with:
           docker_file: 'docker/Dockerfile'
           docker_image: 'public.ecr.aws/unocha/php-k8s'
-          
+
       - name: Setup PHP with PECL extension
         uses: shivammathur/setup-php@v2
         with:

composer.json

@@ -71,10 +71,9 @@
         "drupal/config_default_image": "^2",
         "drupal/config_ignore": "^2.3",
         "drupal/config_split": "^2.0",
-        "drupal/console": "^1.9",
-        "drupal/core-composer-scaffold": "^9.1",
-        "drupal/core-project-message": "^9.1",
-        "drupal/core-recommended": "^9.1",
+        "drupal/core-composer-scaffold": "^10",
+        "drupal/core-project-message": "^10",
+        "drupal/core-recommended": "^10",
         "drupal/ctools": "^3.7",
         "drupal/editor_advanced_link": "^2.2",
         "drupal/field_group": "^3.1",
@@ -111,14 +110,13 @@
         "drupal/social_auth_hid": "^3.2",
         "drupal/stage_file_proxy": "^2.0",
         "drupal/tippy": "^1.0",
-        "drupal/upgrade_status": "^4.0",
         "drupal/username_enumeration_prevention": "^1.3",
         "drupal/view_unpublished": "^1.0",
         "drupal/views_autocomplete_filters": "^1.3",
         "drupal/viewsreference": "^2.0",
         "drupal/warmer": "^2.0",
         "drupal/webp": "^1.0-beta7",
-        "drush/drush": "^11",
+        "drush/drush": "^12",
         "npm-asset/d3": "^7.4",
         "npm-asset/leaflet": "^1.7",
         "npm-asset/leaflet-modal": "^0.2.0",
@@ -131,12 +129,11 @@
         "phpoffice/phpspreadsheet": "^1.19",
         "unocha/common_design": "^9",
         "unocha/d3-sparkline": "^2.1",
-        "unocha/ocha_snap": "^8.3",
-        "wieni/wmbert": "^1.11"
+        "unocha/ocha_snap": "^8.3"
     },
     "require-dev": {
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
-        "drupal/core-dev": "^9.3",
+        "drupal/core-dev": "^10",
         "drupal/devel": "^5.0",
         "drupal/xhprof": "^1.0@beta",
         "drupal/yaml_content": "^1.0@alpha",