From 9cdcfa7dd5f95c275aa9213b695dd79d118a4fa6 Mon Sep 17 00:00:00 2001 From: Finn Date: Wed, 10 Dec 2025 13:15:45 +0000 Subject: [PATCH 1/6] Update namespace on localgov dependencies to point to drupal.org. --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 80953bd..00d7b01 100644 --- a/composer.json +++ b/composer.json @@ -15,8 +15,8 @@ "cweagans/composer-patches": "^1.6", "drupal/core-composer-scaffold": "^10.3", "drupal/core-recommended": "^10.3", - "localgovdrupal/localgov": "^3.0", - "localgovdrupal/localgov_search_solr": "^1.1", + "drupal/localgov": "^3.0", + "drupal/localgov_search_solr": "^1.1", "wikimedia/composer-merge-plugin": "^2.1" }, "require-dev": { @@ -74,12 +74,12 @@ } }, "patches-ignore": { - "localgovdrupal/localgov": { + "drupal/localgov": { "drupal/core": { "Content moderation and Workspaces https://www.drupal.org/project/drupal/issues/3179199#comment-15711680" : "https://www.drupal.org/files/issues/2024-08-11/3179199-3132022-content-moderation-workspaces-query.patch" } }, - "localgovdrupal/localgov_services": { + "drupal/localgov_services": { "drupal/core": { "node_access filters out accessible nodes when node is left joined (1349080)" : "https://git.drupalcode.org/project/drupal/-/commit/c271adb.diff" } From 730ce8c0bee3ff92901bfc73afa121d66e514b37 Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Thu, 11 Dec 2025 14:31:23 +0000 Subject: [PATCH 2/6] Install dev dependencies starting with drupal/localgov_ --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e2ac3ce..eafbc6c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -83,7 +83,7 @@ jobs: - name: Obtain all dev dependencies for LocalGov Drupal run: | composer --working-dir=./html require 'drupal/facets:^2.0' - jq --raw-output '.packages[] | select(.name | startswith("localgovdrupal/")) | ."require-dev" | values | to_entries[] | @sh "\(.key):\(.value)"' ./html/composer.lock | sort | uniq | xargs composer --working-dir=./html require --dev --no-interaction + jq --raw-output '.packages[] | select(.name | startswith("drupal/localgov_")) | ."require-dev" | values | to_entries[] | @sh "\(.key):\(.value)"' ./html/composer.lock | sort | uniq | xargs composer --working-dir=./html require --dev --no-interaction phpcs: name: Coding standards checks From a407d91b264e7bc7cd0aa09a04eeadc4aedd2382 Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Thu, 11 Dec 2025 15:05:09 +0000 Subject: [PATCH 3/6] Update dev dependencies in test workflow Replaced 'drupal/facets' dependency with 'drupal/group'. --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index eafbc6c..adec3f1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -83,7 +83,7 @@ jobs: - name: Obtain all dev dependencies for LocalGov Drupal run: | composer --working-dir=./html require 'drupal/facets:^2.0' - jq --raw-output '.packages[] | select(.name | startswith("drupal/localgov_")) | ."require-dev" | values | to_entries[] | @sh "\(.key):\(.value)"' ./html/composer.lock | sort | uniq | xargs composer --working-dir=./html require --dev --no-interaction + composer --working-dir=./html require 'drupal/group:^3.2' phpcs: name: Coding standards checks From ef5f44c7a2ee54070fed7450bf54959d2a6450fc Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Thu, 11 Dec 2025 15:32:32 +0000 Subject: [PATCH 4/6] Run tests with phpunit --- .github/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index adec3f1..9fa3702 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -191,4 +191,5 @@ jobs: run: | mkdir -p ./html/web/sites/simpletest && chmod 777 ./html/web/sites/simpletest 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" + #docker exec -u docker -t drupal bash -c "cd /var/www/html && ./bin/paratest --processes=4" + docker exec -u docker -t drupal bash -c "cd /var/www/html && ./bin/phpunit" From 82269e45cc82f9bdf5a754a464244175a4adc5ca Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Tue, 16 Dec 2025 11:40:38 +0000 Subject: [PATCH 5/6] Add facets_form dependency to LocalGov Drupal --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9fa3702..3e1baf4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -83,6 +83,7 @@ jobs: - name: Obtain all dev dependencies for LocalGov Drupal run: | composer --working-dir=./html require 'drupal/facets:^2.0' + composer --working-dir=./html require 'drupal/facets_form:^1.3' composer --working-dir=./html require 'drupal/group:^3.2' phpcs: From 117e705515446bdfd37818be808074c3411df8ac Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Tue, 16 Dec 2025 12:37:14 +0000 Subject: [PATCH 6/6] Update PHPUnit command to use Paratest --- .github/workflows/test.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3e1baf4..1a804f4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -82,9 +82,13 @@ jobs: - name: Obtain all dev dependencies for LocalGov Drupal run: | + # Installing all localgov dev dependencies doesn't work due to issues with drupal.org packaging. + # jq --raw-output '.packages[] | select(.name | startswith("drupal/localgov*")) | ."require-dev" | values | to_entries[] | @sh "\(.key):\(.value)"' ./html/composer.lock | sort | uniq | xargs composer --working-dir=./html require --dev --no-interaction + # Instead just install the dependencies needed for the tests. composer --working-dir=./html require 'drupal/facets:^2.0' composer --working-dir=./html require 'drupal/facets_form:^1.3' composer --working-dir=./html require 'drupal/group:^3.2' + phpcs: name: Coding standards checks @@ -192,5 +196,4 @@ jobs: run: | mkdir -p ./html/web/sites/simpletest && chmod 777 ./html/web/sites/simpletest 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" - docker exec -u docker -t drupal bash -c "cd /var/www/html && ./bin/phpunit" + docker exec -u docker -t drupal bash -c "cd /var/www/html && ./bin/paratest --processes=4"