Skip to content

Commit

Permalink
Merge pull request #420 from localgovdrupal/4.x
Browse files Browse the repository at this point in the history
4.0.0-alpha2 release
  • Loading branch information
finnlewis committed Apr 18, 2024
2 parents 3cd0389 + 20e96d4 commit 61faa10
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 13 deletions.
18 changes: 11 additions & 7 deletions .github/workflows/localgov_microsites.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ name: Test LocalGov Microsites localgovdrupal/localgov_microsites drupal-profile
on:
push:
branches:
- '3.x'
- '4.x'
pull_request:
branches:
- '3.x'
- '4.x'

env:
LOCALGOV_DRUPAL_PROJECT: localgovdrupal/localgov_microsites
Expand All @@ -25,11 +25,12 @@ jobs:
fail-fast: false
matrix:
localgov-version:
- '3.x'
- '4.x'
drupal-version:
- '~10.0'
php-version:
- '8.1'
- '8.2'

steps:

Expand Down Expand Up @@ -108,11 +109,12 @@ jobs:
fail-fast: false
matrix:
localgov-version:
- '3.x'
- '4.x'
drupal-version:
- '~10.0'
php-version:
- '8.1'
- '8.2'

steps:

Expand Down Expand Up @@ -143,11 +145,12 @@ jobs:
fail-fast: false
matrix:
localgov-version:
- '3.x'
- '4.x'
drupal-version:
- '~10.0'
php-version:
- '8.1'
- '8.2'

steps:

Expand Down Expand Up @@ -177,11 +180,12 @@ jobs:
fail-fast: false
matrix:
localgov-version:
- '3.x'
- '4.x'
drupal-version:
- '~10.0'
php-version:
- '8.1'
- '8.2'

steps:

Expand All @@ -207,4 +211,4 @@ jobs:
mkdir -p ./html/web/sites/simpletest && chmod 777 ./html/web/sites/simpletest
sed -i "s#http://localgov.lndo.site#http://drupal#" ./html/phpunit.xml.dist
docker exec -t drupal bash -c 'chown docker:docker -R /var/www/html'
docker exec -u docker -t drupal bash -c "cd /var/www/html && ./bin/paratest --processes=4 ${{ env.LOCALGOV_DRUPAL_PROJECT_PATH }}"
docker exec -u docker -t drupal bash -c "cd /var/www/html && ./bin/paratest --processes=4 /var/www/html/${{ env.LOCALGOV_DRUPAL_PROJECT_PATH }}"
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ This work was initially funded by the Local Digital Fund (https://www.localdigit

## Supported branches

We are actively supporting and developing the 2.x branch for Drupal 9.
We are actively supporting and developing the 4.x branch for Drupal 10.

The 1.x branch is no longer actively supported and not recommended for new sites.
The 1.x, 2.x and 3.x branches are no longer actively supported and not recommended for new sites.

If for any reason you are still using the 1.x branch on your site, please [create an issue on Github](https://github.com/localgovdrupal/localgov_microsites/issues) to let us know.
If you are still using the 1.x, 2.x or 3.x branches on your site, please [create an issue on Github](https://github.com/localgovdrupal/localgov_microsites/issues) to let us know.

## Documentation

Expand All @@ -46,7 +46,7 @@ Many of us use the Lando file included to run a local docker environmnent for te

We folllow Drupal's PHP recomendations: https://www.drupal.org/docs/system-requirements/php-requirements#versions

We currently recomend and test against PHP 8.1.
We currently recomend and test against PHP 8.1 and 8.2.

You will also need to have certain PHP extensions enabled (see https://www.drupal.org/docs/system-requirements/php-requirements#extensions) including:

Expand Down Expand Up @@ -97,7 +97,7 @@ To install LocalGov Drupal locally for testing or development, use the
Change `MY_PROJECT` to whatever you'd like your project directory to be called.

```bash
composer create-project localgovdrupal/localgov_microsites_project --stability beta --no-install MY_PROJECT
composer create-project localgovdrupal/localgov_microsites_project --stability alpha --no-install MY_PROJECT
```

Change directory into the MY_PROJECT directory and run lando start.
Expand All @@ -124,7 +124,7 @@ If developing locally and you want to force composer to clone again
from source rather than use composer cache, you can add the `--no-cache` flag.

```bash
lando composer create-project localgovdrupal/localgov_microsites_project --stability beta --stability beta --no-cache --no-install MY_PROJECT
lando composer create-project localgovdrupal/localgov_microsites_project --stability alpha --no-cache --no-install MY_PROJECT
```

If you just want to pull in the latest changes to LocalGov Drupal run composer
Expand Down
3 changes: 3 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@
"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"
},
"drupal/autosave_form": {
"PHP 8.2 deprecation issue with AutosaveFormBuilder": "https://www.drupal.org/files/issues/2024-04-15/fix-php82-deprecation-3355495-19.patch"
}
}
}
Expand Down

0 comments on commit 61faa10

Please sign in to comment.