diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a39cd80..6e6cbaf 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,14 +4,16 @@ on: push: branches: - '4.x' + - '4.1.x' pull_request: branches: - '4.x' + - '4.1.x' workflow_dispatch: jobs: tests: - uses: localgovdrupal/localgov_shared_workflows/.github/workflows/test-microsites.yml@1.x + uses: localgovdrupal/localgov_shared_workflows/.github/workflows/test-microsites.yml@1.x-d11 with: project: 'localgovdrupal/localgov_microsites' project_path: 'web/profiles/contrib/localgov_microsites' diff --git a/composer.json b/composer.json index e812a6e..3639a99 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "php": ">=8.1", "drupal/admin_toolbar": "^3.1", "drupal/autosave_form": "^1.3", - "drupal/core": "^10.0", + "drupal/core": "^10.0 || ^11.0", "drupal/default_content": "^2.0@alpha", "drupal/domain_path": "^1.2", "drupal/gin": "^3.0@RC", @@ -23,17 +23,17 @@ "drupal/metatag": "^2.0.2", "drupal/redirect": "^1.9", "drupal/responsive_preview": "^2.1", - "localgovdrupal/localgov_blogs": "^1.0.0-beta3", + "localgovdrupal/localgov_blogs": "^1.0@beta", "localgovdrupal/localgov_core": "^2.12", "localgovdrupal/localgov_directories": "^3.1", "localgovdrupal/localgov_events": "^3.0", - "localgovdrupal/localgov_microsites_group": "^4.0", + "localgovdrupal/localgov_microsites_group": "4.1.x-dev", "localgovdrupal/localgov_microsites_base": "^2.0", - "localgovdrupal/localgov_microsites_colour_picker_fields": "^1.0.0-beta1", + "localgovdrupal/localgov_microsites_colour_picker_fields": "^1.0@beta", "localgovdrupal/localgov_news": "^2.3", - "localgovdrupal/localgov_page": "^1.0.0-beta2", - "localgovdrupal/localgov_claro": "^2.1.0", - "localgovdrupal/localgov_sa11y": "^1.0.0-beta1", + "localgovdrupal/localgov_page": "^1.0@beta", + "localgovdrupal/localgov_claro": "^2.1", + "localgovdrupal/localgov_sa11y": "^1.0@beta", "drupal/require_login": "^3.0" }, "minimum-stability": "dev", @@ -50,7 +50,8 @@ "patches": { "drupal/domain_path": { "https://github.com/localgovdrupal/localgov_microsites/pull/175#issuecomment-1172879196": "https://raw.githubusercontent.com/localgovdrupal/localgov_microsites/995261d0909065e3124fba3fc0dce3e823aefa1d/patches/domain_path.146-url-aliases.patch", - "https://github.com/localgovdrupal/localgov_microsites_group/issues/326": "https://raw.githubusercontent.com/localgovdrupal/localgov_microsites/4cbdbe6ae3c3e95e7d2ed15d918c66805ad8e7f1/patches/localgov_microsites_group_326.domain_path_pathauto.unserializable.patch" + "https://github.com/localgovdrupal/localgov_microsites_group/issues/326": "https://raw.githubusercontent.com/localgovdrupal/localgov_microsites/4cbdbe6ae3c3e95e7d2ed15d918c66805ad8e7f1/patches/localgov_microsites_group_326.domain_path_pathauto.unserializable.patch", + "Remove unused constructor from DomainPathAliasManager class #3526307": "https://www.drupal.org/files/issues/2025-05-23/3526307-3.patch" } } } diff --git a/localgov_microsites.info.yml b/localgov_microsites.info.yml index abc3ee3..be32a67 100644 --- a/localgov_microsites.info.yml +++ b/localgov_microsites.info.yml @@ -1,7 +1,8 @@ name: LocalGov Drupal Microsites type: profile description: 'Install LocalGov Drupal Microsites.' -core_version_requirement: ^9 || ^10 +core_version_requirement: ^10 || ^11 +version: 4.x install: # Core diff --git a/modules/localgov_microsites_media/localgov_microsites_media.info.yml b/modules/localgov_microsites_media/localgov_microsites_media.info.yml index 9bfaf72..dee5ff0 100644 --- a/modules/localgov_microsites_media/localgov_microsites_media.info.yml +++ b/modules/localgov_microsites_media/localgov_microsites_media.info.yml @@ -2,7 +2,7 @@ name: LocalGov Microsites Media description: LocalGov Media configuration required for Microsites profile. package: LocalGov Drupal type: module -core_version_requirement: ^8.8 || ^9 || ^10 +core_version_requirement: ^10 || ^11 dependencies: - drupal:editor