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.

Sign up for GitHub

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

[wip] feat: drupal 11 support #796

Draft
wants to merge 4 commits into
base: 3.x
Choose a base branch
from
Draft

[wip] feat: drupal 11 support #796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
68f0ea6
feat: drupal 11 support
millnut Dec 12, 2024
9143069
feat: drupal 11 support
millnut Dec 12, 2024
d630e3d
feat: drupal 11 support
millnut Dec 31, 2024
d34dc91
fix: allow installation of geofield_map on d11
millnut Jan 1, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

jobs:
tests:
uses: localgovdrupal/localgov_shared_workflows/.github/workflows/test-module.yml@1.x
uses: localgovdrupal/localgov_shared_workflows/.github/workflows/test-module.yml@feature/1.x/d11-support
with:
project: 'localgovdrupal/localgov'
project_path: 'web/profiles/contrib/localgov'
12 changes: 6 additions & 6 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
],
"require": {
"drupal/admin_toolbar": "^3.0",
"drupal/content_lock": "^2.4",
"drupal/core": "^10.0",
"drupal/content_lock": "^3.0@alpha",
"drupal/core": "^10.0 || ^11.0",
"drupal/gin": "^3.0@alpha",
"drupal/gin_login": "^2.0.3",
"drupal/gin_toolbar": "^1.0@beta",
Expand All @@ -23,7 +23,7 @@
"drupal/redirect": "^1.10",
"drupal/simple_sitemap": "^4.1",
"drupal/search_api": "^1.21",
"drush/drush": ">=10",
"drush/drush": ">=10 || >=13",
"localgovdrupal/localgov_alert_banner": "^1.2.0",
"localgovdrupal/localgov_base": "^1.3.1",
"localgovdrupal/localgov_core": "^2.12.0",
Expand All @@ -41,11 +41,11 @@
"localgovdrupal/localgov_subsites": "^2.3.0",
"localgovdrupal/localgov_scarfolk": "^1.1.2",
"localgovdrupal/localgov_workflows": "^1.2.0",
"php": ">=8.1.0"
"php": ">=8.1.0 || >=8.3.0"
},
"require-dev": {
"drupal/core-dev": "^10.0",
"drupal/geofield_map": "^3.0"
"drupal/core-dev": "^10.0 || ^11.0",
"drupal/geofield_map": "^3.0 || ^11.0"
},
"minimum-stability": "dev",
"prefer-stable": true,
Expand Down
2 changes: 1 addition & 1 deletion localgov.info.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: LocalGov Drupal
type: profile
description: 'Install a LocalGov Drupal site.'
core_version_requirement: ^9 || ^10
core_version_requirement: ^10 || ^11

install:
# Core
Expand Down
2 changes: 1 addition & 1 deletion modules/localgov_content_lock/localgov_content_lock.info.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: LocalGov Content Lock
type: module
description: Customises the Content Lock module for use with LocalGov Drupal
package: LocalGov Drupal
core_version_requirement: ^9 || ^10
core_version_requirement: ^10 || ^11
dependencies:
- content_lock:content_lock
- content_lock:content_lock_timeout
2 changes: 1 addition & 1 deletion modules/localgov_login_redirect/localgov_login_redirect.info.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: LocalGov Login Redirect
description: Simple module to redirect users at login.
package: LocalGov Drupal
type: module
core_version_requirement: ^9 || ^10
core_version_requirement: ^10 || ^11

configure: localgov_login_redirect.settings
dependencies:
Expand Down
Loading