Skip to content

Commit 27d513a

Browse files
richardgauntrichardgaunt
committed
Merge branch 'release/1.9.0'
2 parents 632e50a + 48deff5 commit 27d513a

File tree

82 files changed

+3414
-1361
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+3414
-1361
lines changed

‎.circleci/config.yml‎

Lines changed: 54 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -295,34 +295,25 @@ jobs:
295295
docker:
296296
- image: cimg/php:8.2-browsers
297297
environment:
298-
DRUPAL_VERSION: 10.2
298+
DRUPAL_VERSION: 10.3
299299
DRUPAL_PROJECT_SHA: 10.x
300300
<<: *job-build-isolated
301301

302-
build-isolated-php-82-legacy:
303-
<<: *runner_config
304-
docker:
305-
- image: cimg/php:8.2-browsers
306-
environment:
307-
DRUPAL_VERSION: 10.2
308-
DRUPAL_PROJECT_SHA: 10.x
309-
<<: *job-build-isolated
310-
311-
build-isolated-php-82-next:
302+
build-isolated-php-83:
312303
<<: *runner_config
313304
docker:
314-
- image: cimg/php:8.2-browsers
305+
- image: cimg/php:8.3-browsers
315306
environment:
316-
DRUPAL_VERSION: 10@beta
307+
DRUPAL_VERSION: 10.3
317308
DRUPAL_PROJECT_SHA: 10.x
318309
<<: *job-build-isolated
319310

320-
build-isolated-php-83:
311+
build-isolated-php-83-legacy:
321312
<<: *runner_config
322313
docker:
323314
- image: cimg/php:8.3-browsers
324315
environment:
325-
DRUPAL_VERSION: stable
316+
DRUPAL_VERSION: 10.3
326317
DRUPAL_PROJECT_SHA: 10.x
327318
<<: *job-build-isolated
328319

@@ -335,6 +326,24 @@ jobs:
335326
DRUPAL_PROJECT_SHA: 10.x
336327
<<: *job-build-isolated
337328

329+
# build-isolated-php-84:
330+
# <<: *runner_config
331+
# docker:
332+
# - image: cimg/php:8.4-browsers
333+
# environment:
334+
# DRUPAL_VERSION: stable
335+
# DRUPAL_PROJECT_SHA: 10.x
336+
# <<: *job-build-isolated
337+
338+
# build-isolated-php-84-next:
339+
# <<: *runner_config
340+
# docker:
341+
# - image: cimg/php:8.4-browsers
342+
# environment:
343+
# DRUPAL_VERSION: 10@beta
344+
# DRUPAL_PROJECT_SHA: 10.x
345+
# <<: *job-build-isolated
346+
338347
# Used to pass the built code down the pipeline.
339348
build-minimal:
340349
<<: *runner_config
@@ -514,7 +523,7 @@ jobs:
514523
################################################################################
515524

516525
workflows:
517-
version: 2
526+
version: 2.1
518527
#
519528
# Commit workflow. Runs for every commit push to the remote repository.
520529
commit:
@@ -525,19 +534,13 @@ workflows:
525534
ignore: /^content\/.*/
526535
tags:
527536
only: /.*/
528-
- build-isolated-php-82-legacy:
529-
filters:
530-
branches:
531-
ignore: /^content\/.*/
532-
tags:
533-
only: /.*/
534-
- build-isolated-php-82-next:
537+
- build-isolated-php-83:
535538
filters:
536539
branches:
537540
ignore: /^content\/.*/
538541
tags:
539542
only: /.*/
540-
- build-isolated-php-83:
543+
- build-isolated-php-83-legacy:
541544
filters:
542545
branches:
543546
ignore: /^content\/.*/
@@ -549,13 +552,26 @@ workflows:
549552
ignore: /^content\/.*/
550553
tags:
551554
only: /.*/
555+
# - build-isolated-php-84:
556+
# filters:
557+
# branches:
558+
# ignore: /^content\/.*/
559+
# tags:
560+
# only: /.*/
561+
# - build-isolated-php-84-next:
562+
# filters:
563+
# branches:
564+
# ignore: /^content\/.*/
565+
# tags:
566+
# only: /.*/
552567
- build-minimal:
553568
requires:
554569
- build-isolated-php-82
555-
- build-isolated-php-82-legacy
556-
- build-isolated-php-82-next
557570
- build-isolated-php-83
571+
- build-isolated-php-83-legacy
558572
- build-isolated-php-83-next
573+
# - build-isolated-php-84
574+
# - build-isolated-php-84-next
559575
filters:
560576
branches:
561577
ignore: /^content\/.*/
@@ -564,10 +580,11 @@ workflows:
564580
- build-minimal-subtheme:
565581
requires:
566582
- build-isolated-php-82
567-
- build-isolated-php-82-legacy
568-
- build-isolated-php-82-next
569583
- build-isolated-php-83
584+
- build-isolated-php-83-legacy
570585
- build-isolated-php-83-next
586+
# - build-isolated-php-84
587+
# - build-isolated-php-84-next
571588
filters:
572589
branches:
573590
ignore: /^content\/.*/
@@ -576,10 +593,11 @@ workflows:
576593
- build-govcms:
577594
requires:
578595
- build-isolated-php-82
579-
- build-isolated-php-82-legacy
580-
- build-isolated-php-82-next
581596
- build-isolated-php-83
597+
- build-isolated-php-83-legacy
582598
- build-isolated-php-83-next
599+
# - build-isolated-php-84
600+
# - build-isolated-php-84-next
583601
filters:
584602
branches:
585603
ignore: /^content\/.*/
@@ -588,10 +606,11 @@ workflows:
588606
- build-govcms-subtheme:
589607
requires:
590608
- build-isolated-php-82
591-
- build-isolated-php-82-legacy
592-
- build-isolated-php-82-next
593609
- build-isolated-php-83
610+
- build-isolated-php-83-legacy
594611
- build-isolated-php-83-next
612+
# - build-isolated-php-84
613+
# - build-isolated-php-84-next
595614
filters:
596615
branches:
597616
ignore: /^content\/.*/
@@ -600,10 +619,11 @@ workflows:
600619
- build-govcms-subtheme-sibling:
601620
requires:
602621
- build-isolated-php-82
603-
- build-isolated-php-82-legacy
604-
- build-isolated-php-82-next
605622
- build-isolated-php-83
623+
- build-isolated-php-83-legacy
606624
- build-isolated-php-83-next
625+
# - build-isolated-php-84
626+
# - build-isolated-php-84-next
607627
filters:
608628
branches:
609629
ignore: /^content\/.*/

‎.docker/cli.dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
# - Installs CivicTheme dependencies and builds assets
77
# - Creates sub-theme, installs dependencies and builds assets
88
#
9-
# @see https://hub.docker.com/r/uselagoon/php-8.2-cli-drupal/tags
9+
# @see https://hub.docker.com/r/uselagoon/php-8.3-cli-drupal/tags
1010
# @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-cli-drupal
1111
#
1212
# hadolint global ignore=DL3018
13-
FROM uselagoon/php-8.2-cli-drupal:24.5.1
13+
FROM uselagoon/php-8.3-cli-drupal:24.10.0
1414

1515
# Add missing variables.
1616
# @todo Remove once https://github.com/uselagoon/lagoon/issues/3121 is resolved.

‎.docker/cli.onlytheme.dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
# - Installs Composer dependencies
66
# - Installs CivicTheme dependencies and builds assets
77
#
8-
# @see https://hub.docker.com/r/uselagoon/php-8.2-cli-drupal/tags
8+
# @see https://hub.docker.com/r/uselagoon/php-8.3-cli-drupal/tags
99
# @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-cli-drupal
1010
#
1111
# hadolint global ignore=DL3018
12-
FROM uselagoon/php-8.2-cli-drupal:24.5.1
12+
FROM uselagoon/php-8.3-cli-drupal:24.10.0
1313

1414
# Add missing variables.
1515
# @todo Remove once https://github.com/uselagoon/lagoon/issues/3121 is resolved.

‎.docker/cli.sibling.dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
# - Installs CivicTheme dependencies and builds assets
77
# - Creates sub-theme as a sibling, installs dependencies and builds assets
88
#
9-
# @see https://hub.docker.com/r/uselagoon/php-8.2-cli-drupal/tags
9+
# @see https://hub.docker.com/r/uselagoon/php-8.3-cli-drupal/tags
1010
# @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-cli-drupal
1111
#
1212
# hadolint global ignore=DL3018
13-
FROM uselagoon/php-8.2-cli-drupal:24.5.1
13+
FROM uselagoon/php-8.3-cli-drupal:24.10.0
1414

1515
# Add missing variables.
1616
# @todo Remove once https://github.com/uselagoon/lagoon/issues/3121 is resolved.

‎.docker/php.dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ ARG CLI_IMAGE
88
# hadolint ignore=DL3006
99
FROM ${CLI_IMAGE:-cli} as cli
1010

11-
# @see https://hub.docker.com/r/uselagoon/php-8.2-fpm/tags
11+
# @see https://hub.docker.com/r/uselagoon/php-8.3-fpm/tags
1212
# @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-fpm
13-
FROM uselagoon/php-8.2-fpm:24.5.1
13+
FROM uselagoon/php-8.3-fpm:24.10.0
1414

1515
RUN apk add --no-cache tzdata
1616

‎composer.json‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
"php": ">=8.2",
77
"composer/installers": "^2.1",
88
"cweagans/composer-patches": "^1.7",
9-
"drupal/core-composer-scaffold": "^10.2",
9+
"drupal/core-composer-scaffold": "^10.3",
1010
"drupal/core-project-message": "^10",
11-
"drupal/core-recommended": "^10.2",
11+
"drupal/core-recommended": "^10.3",
1212
"drupal/search_api": "^1.30",
1313
"drush/drush": "^12",
1414
"oomphinc/composer-installers-extender": "^2.0",
@@ -88,10 +88,11 @@
8888
"php-http/discovery": true,
8989
"phpstan/extension-installer": true,
9090
"pyrech/composer-changelogs": true,
91-
"wikimedia/composer-merge-plugin": true
91+
"wikimedia/composer-merge-plugin": true,
92+
"tbachert/spi": true
9293
},
9394
"platform": {
94-
"php": "8.2.13"
95+
"php": "8.3.8"
9596
},
9697
"process-timeout": 0,
9798
"sort-packages": true
@@ -173,9 +174,6 @@
173174
"patches": {
174175
"drupal/core": {
175176
"Builds failing on missing layout column plugin": "https://www.drupal.org/files/issues/2023-07-16/3204271-20-missing-layout-exception.patch"
176-
},
177-
"mglaman/phpstan-drupal": {
178-
"Allow to provide drupal_root via an environment variable.": "https://github.com/mglaman/phpstan-drupal/pull/702.patch"
179177
}
180178
},
181179
"preserve-paths": [

0 commit comments

Comments
 (0)