Skip to content

Commit b2a9e76

Browse files
authored
Merge branch '3.x' into update-ddev-selenium
2 parents 1ed4d55 + 6cfc075 commit b2a9e76

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

.ddev/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: thunder-develop
22
type: drupal
33
docroot: docroot
44
php_version: "8.3"
5-
webserver_type: apache-fpm
5+
webserver_type: nginx-fpm
66
xdebug_enabled: false
77
additional_hostnames: []
88
additional_fqdns: []
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- uses: shivammathur/setup-php@v2
2121
with:
2222
coverage: none
23-
php-version: '8.3'
23+
php-version: '8.4'
2424
extensions: Imagick
2525

2626
- name: Start MySql service

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@
151151
"merge-extra-deep": true
152152
},
153153
"local-develop-packages": {
154-
"thunder/thunder-distribution": "8.0.x",
154+
"thunder/thunder-distribution": "8.3.x",
155155
"drupal/paragraphs_features": "2.x",
156156
"drupal/paragraphs_paste": "2.x",
157157
"drupal/select2": "2.x",

0 commit comments

Comments
 (0)