diff --git a/.ddev/config.yaml b/.ddev/config.yaml index a276892..4b8e35a 100644 --- a/.ddev/config.yaml +++ b/.ddev/config.yaml @@ -10,7 +10,7 @@ additional_hostnames: [] additional_fqdns: [] database: type: mariadb - version: "10.3" + version: "10.6" nfs_mount_enabled: false mutagen_enabled: false use_dns_when_possible: true diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4c6196b..d117cee 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,9 +7,11 @@ on: push: branches: - '3.x' + - '3.2.x' pull_request: branches: - '3.x' + - '3.2.x' schedule: - cron: '0 7 * * *' workflow_dispatch: @@ -28,14 +30,25 @@ jobs: strategy: fail-fast: false matrix: - localgov-version: - - '3.x' - drupal-version: - - '~10.0' - php-version: - - '8.1' - - '8.2' - - '8.3' + include: + - localgov-version: '3.x' + drupal-version: '~10.0' + php-version: '8.1' + - localgov-version: '3.x' + drupal-version: '~10.0' + php-version: '8.2' + - localgov-version: '3.x' + drupal-version: '~10.0' + php-version: '8.3' + - localgov-version: '3.x' + drupal-version: '~10.0' + php-version: '8.4' + - localgov-version: '3.x' + drupal-version: '~11.0' + php-version: '8.3' + - localgov-version: '3.x' + drupal-version: '~11.0' + php-version: '8.4' steps: - name: Save git branch and git repo names to env if this is not a pull request @@ -78,10 +91,14 @@ jobs: ref: php${{ matrix.php-version }} - name: Create LocalGov Drupal project - run: composer create-project --stability dev localgovdrupal/localgov-project:${COMPOSER_REF} ./html + run: | + composer create-project --stability dev --no-install localgovdrupal/localgov-project:${COMPOSER_REF} ./html + composer require --working-dir=./html --no-install --with-all-dependencies drupal/core-recommended:${{ matrix.drupal-version }} drupal/core-composer-scaffold:${{ matrix.drupal-version }} drupal/core-project-message:${{ matrix.drupal-version }} drupal/core-dev:${{ matrix.drupal-version }} + composer install --working-dir=./html - name: Obtain all dev dependencies for LocalGov Drupal - run: 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 + run: | + 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 phpcs: name: Coding standards checks @@ -94,9 +111,9 @@ jobs: localgov-version: - '3.x' drupal-version: - - '~10.0' + - '~11.0' php-version: - - '8.3' + - '8.4' steps: - name: Cached workspace @@ -128,9 +145,9 @@ jobs: localgov-version: - '3.x' drupal-version: - - '~10.0' + - '~11.0' php-version: - - '8.3' + - '8.4' steps: - name: Cached workspace @@ -150,6 +167,7 @@ jobs: run: | cd html ./bin/phpstan analyse -c ./phpstan.neon ./web/modules/contrib/localgov* ./web/profiles/contrib/localgov* ./web/themes/contrib/localgov* + phpunit: name: PHPUnit tests needs: build @@ -158,14 +176,25 @@ jobs: strategy: fail-fast: false matrix: - localgov-version: - - '3.x' - drupal-version: - - '~10.0' - php-version: - - '8.1' - - '8.2' - - '8.3' + include: + - localgov-version: '3.x' + drupal-version: '~10.0' + php-version: '8.1' + - localgov-version: '3.x' + drupal-version: '~10.0' + php-version: '8.2' + - localgov-version: '3.x' + drupal-version: '~10.0' + php-version: '8.3' + - localgov-version: '3.x' + drupal-version: '~10.0' + php-version: '8.4' + - localgov-version: '3.x' + drupal-version: '~11.0' + php-version: '8.3' + - localgov-version: '3.x' + drupal-version: '~11.0' + php-version: '8.4' steps: - name: Clone Drupal container diff --git a/.gitignore b/.gitignore index 861a9cb..881ec10 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ # Ignore directories generated by Composer /drush/contrib/ +/recipes/ /vendor/ /web/core/ /web/modules/contrib/ diff --git a/.lando.dist.yml b/.lando.dist.yml index 9c46dad..31b429b 100644 --- a/.lando.dist.yml +++ b/.lando.dist.yml @@ -1,9 +1,9 @@ name: localgov -recipe: drupal10 +recipe: drupal11 config: webroot: web - php: '8.1' - database: mariadb:10.6 + php: '8.3' + database: mariadb:10.11 proxy: mailhog: - mail.localgov.lndo.site diff --git a/composer.json b/composer.json index fb89730..2669c2c 100644 --- a/composer.json +++ b/composer.json @@ -11,18 +11,18 @@ } }, "require": { - "composer/installers": "^1.10", + "composer/installers": "^1.10 || ^2.3", "cweagans/composer-patches": "^1.6", - "drupal/core-composer-scaffold": "^10.3", - "drupal/core-recommended": "^10.3", + "drupal/core-composer-scaffold": "^10.3 || ^11.0", + "drupal/core-recommended": "^10.3 || ^11.0", "localgovdrupal/localgov": "^3.0", "localgovdrupal/localgov_search_solr": "^1.1", "wikimedia/composer-merge-plugin": "^2.1" }, "require-dev": { - "brianium/paratest": "^6.0", + "brianium/paratest": "^6.0 || ^7.3.1", "drupal/coder": "^8.3", - "drupal/core-dev": "^10.3", + "drupal/core-dev": "^10.3 || ^11.0", "mglaman/phpstan-drupal": "^1.0", "phpspec/prophecy-phpunit": "^2", "phpstan/phpstan": "^1.0", diff --git a/phpunit.d11.xml.dist b/phpunit.d11.xml.dist new file mode 100644 index 0000000..971f6d5 --- /dev/null +++ b/phpunit.d11.xml.dist @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + web/profiles/contrib/localgov + + + web/modules/contrib/localgov_* + + + ./web/themes/contrib/localgov_* + + + + diff --git a/phpunit.xml.dist b/phpunit.xml.dist index c5bf1a0..d39bfc7 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -4,6 +4,8 @@ beStrictAboutTestsThatDoNotTestAnything="true" beStrictAboutOutputDuringTests="true" beStrictAboutChangesToGlobalState="true" + failOnWarning="true" + cacheResult="false" printerClass="\Drupal\Tests\Listeners\HtmlOutputPrinter">