Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #3475110 by joshua1234511, richardgaunt, sime, granticusiv: Illegal access to constants in shipshape on govcms #1314

Merged
merged 21 commits into from
Nov 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 54 additions & 34 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -295,34 +295,25 @@ jobs:
docker:
- image: cimg/php:8.2-browsers
environment:
DRUPAL_VERSION: 10.2
DRUPAL_VERSION: 10.3
DRUPAL_PROJECT_SHA: 10.x
<<: *job-build-isolated

build-isolated-php-82-legacy:
richardgaunt marked this conversation as resolved.
Show resolved Hide resolved
<<: *runner_config
docker:
- image: cimg/php:8.2-browsers
environment:
DRUPAL_VERSION: 10.2
DRUPAL_PROJECT_SHA: 10.x
<<: *job-build-isolated

build-isolated-php-82-next:
build-isolated-php-83:
<<: *runner_config
docker:
- image: cimg/php:8.2-browsers
- image: cimg/php:8.3-browsers
environment:
DRUPAL_VERSION: 10@beta
DRUPAL_VERSION: 10.3
DRUPAL_PROJECT_SHA: 10.x
<<: *job-build-isolated

build-isolated-php-83:
build-isolated-php-83-legacy:
<<: *runner_config
docker:
- image: cimg/php:8.3-browsers
environment:
DRUPAL_VERSION: stable
DRUPAL_VERSION: 10.3
DRUPAL_PROJECT_SHA: 10.x
<<: *job-build-isolated

Expand All @@ -335,6 +326,24 @@ jobs:
DRUPAL_PROJECT_SHA: 10.x
<<: *job-build-isolated

# build-isolated-php-84:
# <<: *runner_config
# docker:
# - image: cimg/php:8.4-browsers
# environment:
# DRUPAL_VERSION: stable
# DRUPAL_PROJECT_SHA: 10.x
# <<: *job-build-isolated

# build-isolated-php-84-next:
# <<: *runner_config
# docker:
# - image: cimg/php:8.4-browsers
# environment:
# DRUPAL_VERSION: 10@beta
# DRUPAL_PROJECT_SHA: 10.x
# <<: *job-build-isolated

# Used to pass the built code down the pipeline.
build-minimal:
<<: *runner_config
Expand Down Expand Up @@ -514,7 +523,7 @@ jobs:
################################################################################

workflows:
version: 2
version: 2.1
#
# Commit workflow. Runs for every commit push to the remote repository.
commit:
Expand All @@ -525,19 +534,13 @@ workflows:
ignore: /^content\/.*/
tags:
only: /.*/
- build-isolated-php-82-legacy:
filters:
branches:
ignore: /^content\/.*/
tags:
only: /.*/
- build-isolated-php-82-next:
- build-isolated-php-83:
filters:
branches:
ignore: /^content\/.*/
tags:
only: /.*/
- build-isolated-php-83:
- build-isolated-php-83-legacy:
filters:
branches:
ignore: /^content\/.*/
Expand All @@ -549,13 +552,26 @@ workflows:
ignore: /^content\/.*/
tags:
only: /.*/
# - build-isolated-php-84:
# filters:
# branches:
# ignore: /^content\/.*/
# tags:
# only: /.*/
# - build-isolated-php-84-next:
# filters:
# branches:
# ignore: /^content\/.*/
# tags:
# only: /.*/
- build-minimal:
requires:
- build-isolated-php-82
- build-isolated-php-82-legacy
- build-isolated-php-82-next
- build-isolated-php-83
- build-isolated-php-83-legacy
- build-isolated-php-83-next
# - build-isolated-php-84
# - build-isolated-php-84-next
filters:
branches:
ignore: /^content\/.*/
Expand All @@ -564,10 +580,11 @@ workflows:
- build-minimal-subtheme:
requires:
- build-isolated-php-82
- build-isolated-php-82-legacy
- build-isolated-php-82-next
- build-isolated-php-83
- build-isolated-php-83-legacy
- build-isolated-php-83-next
# - build-isolated-php-84
# - build-isolated-php-84-next
filters:
branches:
ignore: /^content\/.*/
Expand All @@ -576,10 +593,11 @@ workflows:
- build-govcms:
requires:
- build-isolated-php-82
- build-isolated-php-82-legacy
- build-isolated-php-82-next
- build-isolated-php-83
- build-isolated-php-83-legacy
- build-isolated-php-83-next
# - build-isolated-php-84
# - build-isolated-php-84-next
filters:
branches:
ignore: /^content\/.*/
Expand All @@ -588,10 +606,11 @@ workflows:
- build-govcms-subtheme:
requires:
- build-isolated-php-82
- build-isolated-php-82-legacy
- build-isolated-php-82-next
- build-isolated-php-83
- build-isolated-php-83-legacy
- build-isolated-php-83-next
# - build-isolated-php-84
# - build-isolated-php-84-next
filters:
branches:
ignore: /^content\/.*/
Expand All @@ -600,10 +619,11 @@ workflows:
- build-govcms-subtheme-sibling:
requires:
- build-isolated-php-82
- build-isolated-php-82-legacy
- build-isolated-php-82-next
- build-isolated-php-83
- build-isolated-php-83-legacy
- build-isolated-php-83-next
# - build-isolated-php-84
# - build-isolated-php-84-next
filters:
branches:
ignore: /^content\/.*/
Expand Down
4 changes: 2 additions & 2 deletions .docker/cli.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
# - Installs CivicTheme dependencies and builds assets
# - Creates sub-theme, installs dependencies and builds assets
#
# @see https://hub.docker.com/r/uselagoon/php-8.2-cli-drupal/tags
# @see https://hub.docker.com/r/uselagoon/php-8.3-cli-drupal/tags
# @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-cli-drupal
#
# hadolint global ignore=DL3018
FROM uselagoon/php-8.2-cli-drupal:24.5.1
FROM uselagoon/php-8.3-cli-drupal:24.10.0

# Add missing variables.
# @todo Remove once https://github.com/uselagoon/lagoon/issues/3121 is resolved.
Expand Down
4 changes: 2 additions & 2 deletions .docker/cli.onlytheme.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
# - Installs Composer dependencies
# - Installs CivicTheme dependencies and builds assets
#
# @see https://hub.docker.com/r/uselagoon/php-8.2-cli-drupal/tags
# @see https://hub.docker.com/r/uselagoon/php-8.3-cli-drupal/tags
# @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-cli-drupal
#
# hadolint global ignore=DL3018
FROM uselagoon/php-8.2-cli-drupal:24.5.1
FROM uselagoon/php-8.3-cli-drupal:24.10.0

# Add missing variables.
# @todo Remove once https://github.com/uselagoon/lagoon/issues/3121 is resolved.
Expand Down
4 changes: 2 additions & 2 deletions .docker/cli.sibling.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
# - Installs CivicTheme dependencies and builds assets
# - Creates sub-theme as a sibling, installs dependencies and builds assets
#
# @see https://hub.docker.com/r/uselagoon/php-8.2-cli-drupal/tags
# @see https://hub.docker.com/r/uselagoon/php-8.3-cli-drupal/tags
# @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-cli-drupal
#
# hadolint global ignore=DL3018
FROM uselagoon/php-8.2-cli-drupal:24.5.1
FROM uselagoon/php-8.3-cli-drupal:24.10.0

# Add missing variables.
# @todo Remove once https://github.com/uselagoon/lagoon/issues/3121 is resolved.
Expand Down
4 changes: 2 additions & 2 deletions .docker/php.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ ARG CLI_IMAGE
# hadolint ignore=DL3006
FROM ${CLI_IMAGE:-cli} as cli

# @see https://hub.docker.com/r/uselagoon/php-8.2-fpm/tags
# @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.2-fpm:24.5.1
FROM uselagoon/php-8.3-fpm:24.10.0

RUN apk add --no-cache tzdata

Expand Down
12 changes: 5 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
"php": ">=8.2",
"composer/installers": "^2.1",
"cweagans/composer-patches": "^1.7",
"drupal/core-composer-scaffold": "^10.2",
"drupal/core-composer-scaffold": "^10.3",
"drupal/core-project-message": "^10",
"drupal/core-recommended": "^10.2",
"drupal/core-recommended": "^10.3",
"drupal/search_api": "^1.30",
"drush/drush": "^12",
"oomphinc/composer-installers-extender": "^2.0",
Expand Down Expand Up @@ -88,10 +88,11 @@
"php-http/discovery": true,
"phpstan/extension-installer": true,
"pyrech/composer-changelogs": true,
"wikimedia/composer-merge-plugin": true
"wikimedia/composer-merge-plugin": true,
"tbachert/spi": true
},
"platform": {
"php": "8.2.13"
"php": "8.3.8"
},
"process-timeout": 0,
"sort-packages": true
Expand Down Expand Up @@ -173,9 +174,6 @@
"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"
},
"mglaman/phpstan-drupal": {
"Allow to provide drupal_root via an environment variable.": "https://github.com/mglaman/phpstan-drupal/pull/702.patch"
}
},
"preserve-paths": [
Expand Down
Loading
Loading