From c6582860905ee0201dd42203900f31ba8b81e810 Mon Sep 17 00:00:00 2001 From: Finn Date: Wed, 10 Sep 2025 18:50:46 +0100 Subject: [PATCH 1/3] Add .gitlab-ci.yml to trigger tests. --- .gitlab-ci.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..e12e584 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,23 @@ +################ +# GitLabCI template for Drupal projects. +################ + +include: + - project: $_GITLAB_TEMPLATES_REPO + ref: $_GITLAB_TEMPLATES_REF + file: + - '/includes/include.drupalci.main.yml' + - '/includes/include.drupalci.variables.yml' + - '/includes/include.drupalci.workflows.yml' +# +################ +# Pipeline configuration variables are defined with default values and descriptions in the file +# https://git.drupalcode.org/project/gitlab_templates/-/blob/main/includes/include.drupalci.variables.yml +################ +variables: + SKIP_CSPELL: "1" + OPT_IN_TEST_MAX_PHP: 1 + OPT_IN_TEST_PREVIOUS_MAJOR: 1 + OPT_IN_TEST_NEXT_MAJOR: 1 + + From 07515f7636de0811769d1da49b359d06a5099228 Mon Sep 17 00:00:00 2001 From: Tony Barker <4941711+tonypaulbarker@users.noreply.github.com> Date: Tue, 7 Oct 2025 12:22:32 +0100 Subject: [PATCH 2/3] Update dependencies to help fix tests (#326) * Update dependencies * paragraphs_library is submodule of paragraphs * paragraphs_library is submodule of paragraphs * Add newline to media.info --- localgov_core.info.yml | 2 ++ modules/localgov_media/localgov_media.info.yml | 3 +++ 2 files changed, 5 insertions(+) diff --git a/localgov_core.info.yml b/localgov_core.info.yml index f92cf86..02bf90b 100644 --- a/localgov_core.info.yml +++ b/localgov_core.info.yml @@ -13,3 +13,5 @@ dependencies: test_dependencies: - paragraphs:paragraphs + - paragraphs:paragraphs_library + - localgov_core:localgov_media_test_config diff --git a/modules/localgov_media/localgov_media.info.yml b/modules/localgov_media/localgov_media.info.yml index 76225a9..88a6b2d 100644 --- a/modules/localgov_media/localgov_media.info.yml +++ b/modules/localgov_media/localgov_media.info.yml @@ -13,3 +13,6 @@ dependencies: - drupal:responsive_image - image_widget_crop:image_widget_crop - linkit:linkit + +test_dependencies: + - localgov_core:localgov_media_test_config From ad2daabdde2c48557bbd58afc6d3c3badf8da1f0 Mon Sep 17 00:00:00 2001 From: Mark Conroy Date: Tue, 7 Oct 2025 12:28:34 +0100 Subject: [PATCH 3/3] adds Microsites Base to themes array (#324) --- src/Service/DefaultBlockInstaller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Service/DefaultBlockInstaller.php b/src/Service/DefaultBlockInstaller.php index b1f1069..46a1d8b 100644 --- a/src/Service/DefaultBlockInstaller.php +++ b/src/Service/DefaultBlockInstaller.php @@ -60,7 +60,7 @@ protected function blockDefinitions(string $module): array { */ protected function targetThemes(): array { - $themes = ['localgov_base', 'localgov_scarfolk']; + $themes = ['localgov_base', 'localgov_scarfolk', 'localgov_microsites_base']; $activeTheme = $this->getActiveThemeName(); if ($activeTheme && !in_array($activeTheme, $themes, TRUE)) {