From 2232d68787fe3a2c15d873b006fddac3a8d4a5d4 Mon Sep 17 00:00:00 2001 From: Lee Mills Date: Tue, 5 Nov 2024 16:31:14 +0000 Subject: [PATCH 1/2] fix: lock packages due to incompatibility with recent changes for 4.x --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 10473e5..5ae9789 100644 --- a/composer.json +++ b/composer.json @@ -22,14 +22,14 @@ "drupal/gin_login": "^2.0", "drupal/gin_toolbar": "^1.0@RC", "drupal/metatag": "^1.22", - "localgovdrupal/localgov_blogs": "^1.0.0-beta3", + "localgovdrupal/localgov_blogs": "1.0.0-beta3", "localgovdrupal/localgov_core": "^2.12", "localgovdrupal/localgov_directories": "^3.0@alpha", "localgovdrupal/localgov_events": "^3.0@alpha", "localgovdrupal/localgov_microsites_group": "^3.0.0-alpha1", "localgovdrupal/localgov_microsites_base": "^2.0.0-beta8", "localgovdrupal/localgov_microsites_colour_picker_fields": "^1.0.0-beta1", - "localgovdrupal/localgov_news": "^2.3", + "localgovdrupal/localgov_news": "2.3.5", "localgovdrupal/localgov_page": "^1.0.0-beta2", "localgovdrupal/localgov_claro": "^2.1.0", "localgovdrupal/localgov_sa11y": "^1.0.0-beta1", From 6849b85dbef804a7308464765d2c1fedc7ffd29c Mon Sep 17 00:00:00 2001 From: Lee Mills Date: Tue, 5 Nov 2024 16:38:15 +0000 Subject: [PATCH 2/2] fix: docker composer in workflow --- .github/workflows/localgov_microsites.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/localgov_microsites.yml b/.github/workflows/localgov_microsites.yml index cb5e945..74b1374 100644 --- a/.github/workflows/localgov_microsites.yml +++ b/.github/workflows/localgov_microsites.yml @@ -197,7 +197,7 @@ jobs: localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}- - name: Start Docker environment - run: docker-compose -f docker-compose.yml up -d + run: docker compose -f docker-compose.yml up -d - name: Run PHPUnit tests run: |