From be0b2bfae80a0927405faabe16b619dc001ec35e Mon Sep 17 00:00:00 2001 From: Richard Gaunt Date: Sun, 24 Nov 2024 12:41:48 +1100 Subject: [PATCH] Add back one build for php8.2. --- .circleci/config.yml | 20 ++++++++++++++++++++ composer.json | 2 +- composer.lock | 8 ++++---- web/themes/contrib/civictheme/composer.json | 2 +- 4 files changed, 26 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 157aab364..4186d4ff2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -290,6 +290,15 @@ jobs: # Isolated theme build within a vanilla Drupal installation. # This replicates (to a degree) what Drupal CI would do. + build-isolated-php-82: + <<: *runner_config + docker: + - image: cimg/php:8.2-browsers + environment: + DRUPAL_VERSION: 10.3 + DRUPAL_PROJECT_SHA: 10.x + <<: *job-build-isolated + build-isolated-php-83: <<: *runner_config docker: @@ -519,6 +528,12 @@ workflows: # Commit workflow. Runs for every commit push to the remote repository. commit: jobs: + - build-isolated-php-82: + filters: + branches: + ignore: /^content\/.*/ + tags: + only: /.*/ - build-isolated-php-83: filters: branches: @@ -551,6 +566,7 @@ workflows: # only: /.*/ - build-minimal: requires: + - build-isolated-php-82 - build-isolated-php-83 - build-isolated-php-83-legacy - build-isolated-php-83-next @@ -563,6 +579,7 @@ workflows: only: /.*/ - build-minimal-subtheme: requires: + - build-isolated-php-82 - build-isolated-php-83 - build-isolated-php-83-legacy - build-isolated-php-83-next @@ -575,6 +592,7 @@ workflows: only: /.*/ - build-govcms: requires: + - build-isolated-php-82 - build-isolated-php-83 - build-isolated-php-83-legacy - build-isolated-php-83-next @@ -587,6 +605,7 @@ workflows: only: /.*/ - build-govcms-subtheme: requires: + - build-isolated-php-82 - build-isolated-php-83 - build-isolated-php-83-legacy - build-isolated-php-83-next @@ -599,6 +618,7 @@ workflows: only: /.*/ - build-govcms-subtheme-sibling: requires: + - build-isolated-php-82 - build-isolated-php-83 - build-isolated-php-83-legacy - build-isolated-php-83-next diff --git a/composer.json b/composer.json index 76e96b268..e9dfdb304 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "Drupal 10 implementation of CivicTheme Source for Salsa Digital", "license": "proprietary", "require": { - "php": ">=8.3", + "php": ">=8.2", "composer/installers": "^2.1", "cweagans/composer-patches": "^1.7", "drupal/core-composer-scaffold": "^10.3", diff --git a/composer.lock b/composer.lock index 72a262bb7..ccaa2cfe6 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "4e2e91777fa8167758cfff0c5bb08562", + "content-hash": "7386e390430c8a338638924c31e96f99", "packages": [ { "name": "asm89/stack-cors", @@ -7461,7 +7461,7 @@ ], "authors": [ { - "name": "Berdir", + "name": "berdir", "homepage": "https://www.drupal.org/user/214652" }, { @@ -7481,7 +7481,7 @@ "homepage": "https://www.drupal.org/user/227761" }, { - "name": "Primsi", + "name": "primsi", "homepage": "https://www.drupal.org/user/282629" } ], @@ -23518,7 +23518,7 @@ "platform": { "php": ">=8.1" }, - "platform-dev": [], + "platform-dev": {}, "platform-overrides": { "php": "8.3.8" }, diff --git a/web/themes/contrib/civictheme/composer.json b/web/themes/contrib/civictheme/composer.json index 9ac3179f5..6c59d8c96 100644 --- a/web/themes/contrib/civictheme/composer.json +++ b/web/themes/contrib/civictheme/composer.json @@ -9,7 +9,7 @@ "issues": "https://github.com/civictheme/monorepo-drupal/issues" }, "require": { - "php": ">=8.3", + "php": ">=8.2", "drupal/components": "^3@beta", "drupal/field_group": "^3.4", "drupal/focal_point": "^2.0",