From 93bfa34b9ffbd3737e47f31106144b76224d1173 Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Thu, 11 Jan 2024 08:49:18 +0000 Subject: [PATCH 1/2] Fix running tests with Paratest in Github Actions --- .github/workflows/localgov_microsites.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/localgov_microsites.yml b/.github/workflows/localgov_microsites.yml index e463e9a..cb5e945 100644 --- a/.github/workflows/localgov_microsites.yml +++ b/.github/workflows/localgov_microsites.yml @@ -1,6 +1,3 @@ -## -# Managed by https://github.com/localgovdrupal/github_workflow_manager ---- name: Test LocalGov Microsites localgovdrupal/localgov_microsites drupal-profile on: @@ -148,7 +145,7 @@ jobs: - '~10.0' php-version: - '8.1' - + steps: - name: Cached workspace @@ -207,4 +204,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 }}" From 4f146233fe2f2306b36830c9d0f1f68a0d01f211 Mon Sep 17 00:00:00 2001 From: Lee <8024370+millnut@users.noreply.github.com> Date: Tue, 12 Nov 2024 11:27:51 +0000 Subject: [PATCH 2/2] [3.x] fix: lock packages due to incompatibility with recent changes for 4.x (#494) * fix: lock packages due to incompatibility with recent changes for 4.x * fix: docker composer in workflow --- .github/workflows/localgov_microsites.yml | 2 +- composer.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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: | 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",