From c5533401703955666d9cb7f62c2ed7183900cfbe Mon Sep 17 00:00:00 2001 From: Joe Corall Date: Mon, 28 Oct 2024 11:58:32 -0400 Subject: [PATCH] Add Drupal 11 support (#65) * Add Drupal 11 support * Update build-2.x.yml * verbose no longer support in phpunit --- .github/workflows/build-2.x.yml | 9 +++++++-- openseadragon.info.yml | 2 +- tests/src/Kernel/ConfigTests.php | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-2.x.yml b/.github/workflows/build-2.x.yml index dd5a353..df6b2b3 100644 --- a/.github/workflows/build-2.x.yml +++ b/.github/workflows/build-2.x.yml @@ -23,9 +23,14 @@ jobs: fail-fast: false matrix: php-versions: ["8.1", "8.2", "8.3"] - drupal-version: ["10.2.x", "10.3.x", "10.4.x-dev"] + drupal-version: ["10.2.x", "10.3.x", "10.4.x-dev", "11.0.x"] allowed_failure: [false] mysql: ["8.0"] + exclude: + - drupal-version: "11.0.x" + php-versions: "8.1" + - drupal-version: "11.0.x" + php-versions: "8.2" name: PHP ${{ matrix.php-versions }} | drupal ${{ matrix.drupal-version }} | mysql ${{ matrix.mysql }} env: @@ -124,4 +129,4 @@ jobs: SIMPLETEST_DB: mysql://drupal:drupal@127.0.0.1/drupal BROWSERTEST_OUTPUT_DIRECTORY: /opt/drupal/web/sites/simpletest/browser_output run: | - $DRUPAL_DIR/vendor/bin/phpunit "--bootstrap=$DRUPAL_WEB_ROOT/core/tests/bootstrap.php" --group $DRUPAL_EXTENSION_NAME --verbose "$GITHUB_WORKSPACE" + $DRUPAL_DIR/vendor/bin/phpunit "--bootstrap=$DRUPAL_WEB_ROOT/core/tests/bootstrap.php" --group $DRUPAL_EXTENSION_NAME "$GITHUB_WORKSPACE" diff --git a/openseadragon.info.yml b/openseadragon.info.yml index 76ac6b3..96f9f36 100644 --- a/openseadragon.info.yml +++ b/openseadragon.info.yml @@ -2,7 +2,7 @@ name: 'OpenSeadragon Viewer' type: module description: 'A light-weight, customizable OpenSeadragon field formatter' package: Media -core_version_requirement: ^9.1 || ^10 +core_version_requirement: ^9.1 || ^10 || ^11 dependencies: - token:token configure: openseadragon.admin_settings diff --git a/tests/src/Kernel/ConfigTests.php b/tests/src/Kernel/ConfigTests.php index 3322169..fb2078b 100644 --- a/tests/src/Kernel/ConfigTests.php +++ b/tests/src/Kernel/ConfigTests.php @@ -23,7 +23,7 @@ class ConfigTests extends KernelTestBase { /** * {@inheritdoc} */ - public static $modules = [ + protected static $modules = [ 'system', 'openseadragon', ];