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 + + 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 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)) {