From 19db152531d0d5fed162e1ff0e252d641eab5ecd Mon Sep 17 00:00:00 2001 From: Rosie Le Faive Date: Tue, 19 Jul 2022 11:21:26 -0300 Subject: [PATCH 01/19] Test matrix: remove php7.3, mysql5.7. --- .github/workflows/build-2.x.yml | 88 ++------------------------------- 1 file changed, 3 insertions(+), 85 deletions(-) diff --git a/.github/workflows/build-2.x.yml b/.github/workflows/build-2.x.yml index f5bce510..52f10710 100644 --- a/.github/workflows/build-2.x.yml +++ b/.github/workflows/build-2.x.yml @@ -22,93 +22,11 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ["7.3", "7.4"] + php-versions: ["7.4", "8.0", "8.1"] test-suite: ["kernel", "functional", "functional-javascript"] - drupal-version: ["9.3.x", "9.4.x-dev"] + drupal-version: ["9.4.x", "9.5.x-dev"] + mysql: ["8.0"] allowed_failure: [false] - mysql: ["5.7"] - # include experimental parts - include: - # 9.3.x on PHP 8.0 - - drupal-version: '9.3.x' - php-versions: '8.0' - mysql: "8.0" - test-suite: "kernel" - allowed_failure: true - - drupal-version: '9.3.x' - php-versions: '8.0' - mysql: "8.0" - test-suite: "functional" - allowed_failure: true - - drupal-version: '9.3.x' - php-versions: '8.0' - mysql: "8.0" - test-suite: "functional-javascript" - allowed_failure: true - # 9.3.x on PHP 8.1 - - drupal-version: '9.3.x' - php-versions: '8.1' - mysql: "8.0" - test-suite: "kernel" - allowed_failure: true - - drupal-version: '9.3.x' - php-versions: '8.1' - mysql: "8.0" - test-suite: "functional" - allowed_failure: true - - drupal-version: '9.3.x' - php-versions: '8.1' - mysql: "8.0" - test-suite: "functional-javascript" - allowed_failure: true - # 9.4.x-dev on PHP "8.0" - - drupal-version: '9.4.x-dev' - php-versions: '8.0' - mysql: "8.0" - test-suite: "kernel" - allowed_failure: true - - drupal-version: '9.4.x-dev' - php-versions: '8.0' - mysql: "8.0" - test-suite: "functional" - allowed_failure: true - - drupal-version: '9.4.x-dev' - php-versions: '8.0' - mysql: "8.0" - test-suite: "functional-javascript" - allowed_failure: true - # 9.4.x-dev on PHP 8.1 - - drupal-version: '9.4.x-dev' - php-versions: '8.1' - mysql: "8.0" - test-suite: "kernel" - allowed_failure: true - - drupal-version: '9.4.x-dev' - php-versions: '8.1' - mysql: "8.0" - test-suite: "functional" - allowed_failure: true - - drupal-version: '9.4.x-dev' - php-versions: '8.1' - mysql: "8.0" - test-suite: "functional-javascript" - allowed_failure: true - # 10.0.x-dev on PHP 8.1 - - drupal-version: '10.0.x-dev' - php-versions: '8.1' - mysql: "8.0" - test-suite: "kernel" - allowed_failure: true - - drupal-version: '10.0.x-dev' - php-versions: '8.1' - mysql: "8.0" - test-suite: "functional" - allowed_failure: true - - drupal-version: '10.0.x-dev' - php-versions: '8.1' - mysql: "8.0" - test-suite: "functional-javascript" - allowed_failure: true name: PHP ${{ matrix.php-versions }} | drupal ${{ matrix.drupal-version }} | mysql ${{ matrix.mysql }} | test-suite ${{ matrix.test-suite }} From 887cd8791e00ef2bc1aa3f112a3e6ad12d8fad9f Mon Sep 17 00:00:00 2001 From: Rosie Le Faive Date: Tue, 19 Jul 2022 11:33:34 -0300 Subject: [PATCH 02/19] Update php version in README. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 83e3f301..d891c0e6 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # ![Islandora](https://cloud.githubusercontent.com/assets/2371345/25624809/f95b0972-2f30-11e7-8992-a8f135402cdc.png) Islandora -[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%207.2-8892BF.svg?style=flat-square)](https://php.net/) +[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%207.4-8892BF.svg?style=flat-square)](https://php.net/) [![Build Status](https://github.com/islandora/islandora/actions/workflows/build-2.x.yml/badge.svg)](https://github.com/Islandora/islandora/actions) [![Contribution Guidelines](http://img.shields.io/badge/CONTRIBUTING-Guidelines-blue.svg)](./CONTRIBUTING.md) [![LICENSE](https://img.shields.io/badge/license-GPLv2-blue.svg?style=flat-square)](./LICENSE) From 4d565164d7980b52c9cbeee09ec9a9df4690ed59 Mon Sep 17 00:00:00 2001 From: Rosie Le Faive Date: Tue, 19 Jul 2022 14:51:58 -0300 Subject: [PATCH 03/19] Update stomp. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c783e12b..24eb9e5b 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "drupal/context": "^4.0@beta", "drupal/search_api": "~1.8", "islandora/jsonld": "^2", - "stomp-php/stomp-php": "4.*", + "stomp-php/stomp-php": "4.* || ^5", "drupal/jwt": "^1.0.0-beta5", "drupal/filehash": "^1.1 || ^2", "drupal/prepopulate" : "^2.2", From 85cf0822f5282f3ba121ef35a445b809cfa0ff2a Mon Sep 17 00:00:00 2001 From: Rosie Le Faive Date: Wed, 20 Jul 2022 07:57:53 -0300 Subject: [PATCH 04/19] Allow failure on php 8.1 and add back drupal 10. --- .github/workflows/build-2.x.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-2.x.yml b/.github/workflows/build-2.x.yml index 52f10710..23a1b444 100644 --- a/.github/workflows/build-2.x.yml +++ b/.github/workflows/build-2.x.yml @@ -22,11 +22,21 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ["7.4", "8.0", "8.1"] + php-versions: ["7.4", "8.0"] test-suite: ["kernel", "functional", "functional-javascript"] drupal-version: ["9.4.x", "9.5.x-dev"] mysql: ["8.0"] allowed_failure: [false] + include: + - php-versions: "8.1" + drupal-version: "9.4.x" + allowed_failure: true + - php-versions: "8.1" + drupal-version: "9.5.x-dev" + allowed_failure: true + - php-versions: "8.1" + drupal-version: "10.0.x-dev" + allowed_failure: true name: PHP ${{ matrix.php-versions }} | drupal ${{ matrix.drupal-version }} | mysql ${{ matrix.mysql }} | test-suite ${{ matrix.test-suite }} From 98c9ba4c636e0102df50bceab2f7ab3a63c211dd Mon Sep 17 00:00:00 2001 From: Rosie Le Faive Date: Wed, 20 Jul 2022 08:24:30 -0300 Subject: [PATCH 05/19] simplify matrix. --- .github/workflows/build-2.x.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-2.x.yml b/.github/workflows/build-2.x.yml index 23a1b444..618e7f66 100644 --- a/.github/workflows/build-2.x.yml +++ b/.github/workflows/build-2.x.yml @@ -29,14 +29,15 @@ jobs: allowed_failure: [false] include: - php-versions: "8.1" - drupal-version: "9.4.x" allowed_failure: true - - php-versions: "8.1" - drupal-version: "9.5.x-dev" + - drupal-version: "10.0.x-dev" allowed_failure: true - - php-versions: "8.1" + exclude: + - php-versions: "7.4" drupal-version: "10.0.x-dev" - allowed_failure: true + - php-versions: "8.0" + drupal-version: "10.0.x-dev" + name: PHP ${{ matrix.php-versions }} | drupal ${{ matrix.drupal-version }} | mysql ${{ matrix.mysql }} | test-suite ${{ matrix.test-suite }} From 5644a68a0692d737148468ad90c1d6665335483f Mon Sep 17 00:00:00 2001 From: Rosie Le Faive Date: Wed, 20 Jul 2022 08:41:37 -0300 Subject: [PATCH 06/19] Try again to use matrix overrides. --- .github/workflows/build-2.x.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-2.x.yml b/.github/workflows/build-2.x.yml index 618e7f66..a40e19e3 100644 --- a/.github/workflows/build-2.x.yml +++ b/.github/workflows/build-2.x.yml @@ -22,16 +22,14 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ["7.4", "8.0"] + php-versions: ["7.4", "8.0", "8.1"] test-suite: ["kernel", "functional", "functional-javascript"] - drupal-version: ["9.4.x", "9.5.x-dev"] + drupal-version: ["9.4.x", "9.5.x-dev", "10.0.x-dev"] mysql: ["8.0"] allowed_failure: [false] include: - php-versions: "8.1" allowed_failure: true - - drupal-version: "10.0.x-dev" - allowed_failure: true exclude: - php-versions: "7.4" drupal-version: "10.0.x-dev" From 551a6673bfd8810d3540d4b8a90a9dc760b94170 Mon Sep 17 00:00:00 2001 From: Rosie Le Faive Date: Wed, 20 Jul 2022 15:34:54 -0300 Subject: [PATCH 07/19] Add back drupal 9.3. --- .github/workflows/build-2.x.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-2.x.yml b/.github/workflows/build-2.x.yml index a40e19e3..ac6b0ca6 100644 --- a/.github/workflows/build-2.x.yml +++ b/.github/workflows/build-2.x.yml @@ -24,7 +24,7 @@ jobs: matrix: php-versions: ["7.4", "8.0", "8.1"] test-suite: ["kernel", "functional", "functional-javascript"] - drupal-version: ["9.4.x", "9.5.x-dev", "10.0.x-dev"] + drupal-version: ["9.3.x", "9.4.x", "9.5.x-dev", "10.0.x-dev"] mysql: ["8.0"] allowed_failure: [false] include: From f4e91b20a33cce96248079e27cb50fbdf6a8adfb Mon Sep 17 00:00:00 2001 From: Rosie Le Faive Date: Wed, 20 Jul 2022 16:03:00 -0300 Subject: [PATCH 08/19] Fix matrix. --- .github/workflows/build-2.x.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-2.x.yml b/.github/workflows/build-2.x.yml index ac6b0ca6..a8e49ba5 100644 --- a/.github/workflows/build-2.x.yml +++ b/.github/workflows/build-2.x.yml @@ -26,8 +26,8 @@ jobs: test-suite: ["kernel", "functional", "functional-javascript"] drupal-version: ["9.3.x", "9.4.x", "9.5.x-dev", "10.0.x-dev"] mysql: ["8.0"] - allowed_failure: [false] include: + - allowed_failure: false - php-versions: "8.1" allowed_failure: true exclude: From cdb83ece9251ca59a47e5de8106efee91676686b Mon Sep 17 00:00:00 2001 From: Rosie Le Faive Date: Wed, 20 Jul 2022 16:42:12 -0300 Subject: [PATCH 09/19] Update matrix. --- .github/workflows/build-2.x.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build-2.x.yml b/.github/workflows/build-2.x.yml index a8e49ba5..1bd91b99 100644 --- a/.github/workflows/build-2.x.yml +++ b/.github/workflows/build-2.x.yml @@ -19,6 +19,7 @@ jobs: build: # The type of runner that the job will run on runs-on: ubuntu-latest + continue-on-error: ${{ matrix.allowed_failure }} strategy: fail-fast: false matrix: @@ -102,7 +103,6 @@ jobs: cd $DRUPAL_DIR chmod -R u+w web/sites/default mkdir -p web/sites/simpletest/browser_output - continue-on-error: ${{ matrix.allowed_failure }} - name: Setup composer paths run: | @@ -117,18 +117,15 @@ jobs: cd $DRUPAL_DIR/web drush --uri=127.0.0.1:8282 en -y islandora_audio islandora_breadcrumbs islandora_iiif islandora_image islandora_video islandora_text_extraction_defaults drush --uri=127.0.0.1:8282 fim -y islandora_core_feature,islandora_text_extraction_defaults - continue-on-error: ${{ matrix.allowed_failure }} - name: Copy PHPunit file run: cp $PHPUNIT_FILE $DRUPAL_DIR/web/core/phpunit.xml - name: Test scripts run: $SCRIPT_DIR/travis_scripts.sh - continue-on-error: ${{ matrix.allowed_failure }} - name: PHPUNIT tests run: | cd $DRUPAL_DIR/web/core $DRUPAL_DIR/vendor/bin/phpunit --verbose --testsuite "${{ matrix.test-suite }}" - continue-on-error: ${{ matrix.allowed_failure }} From 2d8df5a226c240f1595f9e6fdf769461394f0c14 Mon Sep 17 00:00:00 2001 From: Rosie Le Faive Date: Thu, 21 Jul 2022 09:21:16 -0300 Subject: [PATCH 10/19] Remove future versions we're not ready for. --- .github/workflows/build-2.x.yml | 16 +++++----------- .../Functional/IslandoraFunctionalTestBase.php | 9 ++++++--- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build-2.x.yml b/.github/workflows/build-2.x.yml index 1bd91b99..fad82be8 100644 --- a/.github/workflows/build-2.x.yml +++ b/.github/workflows/build-2.x.yml @@ -23,19 +23,13 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ["7.4", "8.0", "8.1"] + php-versions: ["7.4", "8.0"] + # PHP 8.1 fails - see https://github.com/Islandora/islandora/issues/887 test-suite: ["kernel", "functional", "functional-javascript"] - drupal-version: ["9.3.x", "9.4.x", "9.5.x-dev", "10.0.x-dev"] + drupal-version: ["9.3.x", "9.4.x", "9.5.x-dev"] + # Not yet Drupal 10 ready - see https://github.com/Islandora/islandora/issues/888 mysql: ["8.0"] - include: - - allowed_failure: false - - php-versions: "8.1" - allowed_failure: true - exclude: - - php-versions: "7.4" - drupal-version: "10.0.x-dev" - - php-versions: "8.0" - drupal-version: "10.0.x-dev" + allowed_failure: [false] name: PHP ${{ matrix.php-versions }} | drupal ${{ matrix.drupal-version }} | mysql ${{ matrix.mysql }} | test-suite ${{ matrix.test-suite }} diff --git a/tests/src/Functional/IslandoraFunctionalTestBase.php b/tests/src/Functional/IslandoraFunctionalTestBase.php index c154c5c2..1d970b5a 100644 --- a/tests/src/Functional/IslandoraFunctionalTestBase.php +++ b/tests/src/Functional/IslandoraFunctionalTestBase.php @@ -278,11 +278,13 @@ EOD; * Creates a test context. */ protected function createContext($label, $name) { - $this->drupalPostForm('admin/structure/context/add', [ + $this->drupalGet('admin/structure/context/add'); + $values = [ 'label' => $label, 'name' => $name, - ], - $this->t('Save')); + ]; + $this->submitForm($values, 'Save'); + $this->assertSession()->statusCodeEquals(200); } @@ -455,3 +457,4 @@ EOD; } } + From 704405e3daeb1320d925c2758c209ac3c0f14a66 Mon Sep 17 00:00:00 2001 From: Rosie Le Faive Date: Thu, 21 Jul 2022 09:49:00 -0300 Subject: [PATCH 11/19] no newline is one newline. --- tests/src/Functional/IslandoraFunctionalTestBase.php | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/src/Functional/IslandoraFunctionalTestBase.php b/tests/src/Functional/IslandoraFunctionalTestBase.php index 1d970b5a..2e4c88e8 100644 --- a/tests/src/Functional/IslandoraFunctionalTestBase.php +++ b/tests/src/Functional/IslandoraFunctionalTestBase.php @@ -457,4 +457,3 @@ EOD; } } - From dd58302b9889d3d6e9b94e1e0d17cc5eec942a7d Mon Sep 17 00:00:00 2001 From: Rosie Le Faive Date: Thu, 21 Jul 2022 20:07:00 -0300 Subject: [PATCH 12/19] Try to get FunctionalJavascript working. --- .github/workflows/build-2.x.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/build-2.x.yml b/.github/workflows/build-2.x.yml index fad82be8..13b2e56a 100644 --- a/.github/workflows/build-2.x.yml +++ b/.github/workflows/build-2.x.yml @@ -118,6 +118,15 @@ jobs: - name: Test scripts run: $SCRIPT_DIR/travis_scripts.sh + # needed for FunctionalJavascript + - name: Set up chromedriver + uses: actions/checkout@v2 + uses: nanasess/setup-chromedriver@v1 + run: | + export DISPLAY=:99 + chromedriver --url-base=/wd/hub & + sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 & # optional + - name: PHPUNIT tests run: | cd $DRUPAL_DIR/web/core From 724d0845f454ef058cc5d9baf19a983d44c90a23 Mon Sep 17 00:00:00 2001 From: Rosie Le Faive Date: Thu, 21 Jul 2022 20:12:10 -0300 Subject: [PATCH 13/19] typo. --- .github/workflows/build-2.x.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-2.x.yml b/.github/workflows/build-2.x.yml index 13b2e56a..3ca7cc50 100644 --- a/.github/workflows/build-2.x.yml +++ b/.github/workflows/build-2.x.yml @@ -120,7 +120,6 @@ jobs: # needed for FunctionalJavascript - name: Set up chromedriver - uses: actions/checkout@v2 uses: nanasess/setup-chromedriver@v1 run: | export DISPLAY=:99 From cebeeaec5cc5e7889921151641f353527eb25e7a Mon Sep 17 00:00:00 2001 From: Rosie Le Faive Date: Thu, 21 Jul 2022 20:13:40 -0300 Subject: [PATCH 14/19] typo. --- .github/workflows/build-2.x.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-2.x.yml b/.github/workflows/build-2.x.yml index 3ca7cc50..cd48c5e7 100644 --- a/.github/workflows/build-2.x.yml +++ b/.github/workflows/build-2.x.yml @@ -119,8 +119,10 @@ jobs: run: $SCRIPT_DIR/travis_scripts.sh # needed for FunctionalJavascript - - name: Set up chromedriver + - name: Setup chromedriver uses: nanasess/setup-chromedriver@v1 + + - name: Start chromedriver run: | export DISPLAY=:99 chromedriver --url-base=/wd/hub & From 1415bd509bb4c1b38c5cc649cc51cf8ea13943b5 Mon Sep 17 00:00:00 2001 From: Rosie Le Faive Date: Thu, 21 Jul 2022 20:35:05 -0300 Subject: [PATCH 15/19] chromedriver. --- .github/workflows/build-2.x.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build-2.x.yml b/.github/workflows/build-2.x.yml index cd48c5e7..d95b1d6b 100644 --- a/.github/workflows/build-2.x.yml +++ b/.github/workflows/build-2.x.yml @@ -125,8 +125,7 @@ jobs: - name: Start chromedriver run: | export DISPLAY=:99 - chromedriver --url-base=/wd/hub & - sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 & # optional + chromedriver --port=4444 - name: PHPUNIT tests run: | From 705f623fdb303a0f1a86382ff097bf971440591a Mon Sep 17 00:00:00 2001 From: Rosie Le Faive Date: Thu, 21 Jul 2022 20:44:25 -0300 Subject: [PATCH 16/19] chromedriver. --- .github/workflows/build-2.x.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-2.x.yml b/.github/workflows/build-2.x.yml index d95b1d6b..beb1b6f8 100644 --- a/.github/workflows/build-2.x.yml +++ b/.github/workflows/build-2.x.yml @@ -125,7 +125,7 @@ jobs: - name: Start chromedriver run: | export DISPLAY=:99 - chromedriver --port=4444 + chromedriver --port=4444 & - name: PHPUNIT tests run: | From 87231dc5c032eb91bb95160e9300e86fa598b6a7 Mon Sep 17 00:00:00 2001 From: Rosie Le Faive Date: Thu, 21 Jul 2022 22:14:09 -0300 Subject: [PATCH 17/19] try now --- .github/workflows/build-2.x.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-2.x.yml b/.github/workflows/build-2.x.yml index beb1b6f8..a6b29565 100644 --- a/.github/workflows/build-2.x.yml +++ b/.github/workflows/build-2.x.yml @@ -125,7 +125,7 @@ jobs: - name: Start chromedriver run: | export DISPLAY=:99 - chromedriver --port=4444 & + chromedriver --port=4444 --no-sandbox & - name: PHPUNIT tests run: | From 07e3c49ecc967824658cb910c82c45d45d746f44 Mon Sep 17 00:00:00 2001 From: Rosie Le Faive Date: Fri, 22 Jul 2022 09:08:17 -0300 Subject: [PATCH 18/19] Add webdriver setting in phpunit.xml. --- .github/workflows/build-2.x.yml | 2 +- phpunit.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-2.x.yml b/.github/workflows/build-2.x.yml index a6b29565..ab6a4b07 100644 --- a/.github/workflows/build-2.x.yml +++ b/.github/workflows/build-2.x.yml @@ -125,7 +125,7 @@ jobs: - name: Start chromedriver run: | export DISPLAY=:99 - chromedriver --port=4444 --no-sandbox & + chromedriver --port=4444 --no-sandbox --url-base=/wd/hub & - name: PHPUNIT tests run: | diff --git a/phpunit.xml b/phpunit.xml index a4091781..3e6e1562 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -47,7 +47,7 @@ - + From eb53ff474eaf374cfc143aa7925ec1c9ee7388ba Mon Sep 17 00:00:00 2001 From: Rosie Le Faive Date: Fri, 22 Jul 2022 10:35:23 -0300 Subject: [PATCH 19/19] revert setting up chromedriver. --- .github/workflows/build-2.x.yml | 14 +++----------- phpunit.xml | 2 +- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-2.x.yml b/.github/workflows/build-2.x.yml index ab6a4b07..439395b0 100644 --- a/.github/workflows/build-2.x.yml +++ b/.github/workflows/build-2.x.yml @@ -23,11 +23,12 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ["7.4", "8.0"] # PHP 8.1 fails - see https://github.com/Islandora/islandora/issues/887 + php-versions: ["7.4", "8.0"] + # test-suite functional-javascript will appear to pass but will skip tests; missing chromedriver. test-suite: ["kernel", "functional", "functional-javascript"] - drupal-version: ["9.3.x", "9.4.x", "9.5.x-dev"] # Not yet Drupal 10 ready - see https://github.com/Islandora/islandora/issues/888 + drupal-version: ["9.3.x", "9.4.x", "9.5.x-dev"] mysql: ["8.0"] allowed_failure: [false] @@ -118,15 +119,6 @@ jobs: - name: Test scripts run: $SCRIPT_DIR/travis_scripts.sh - # needed for FunctionalJavascript - - name: Setup chromedriver - uses: nanasess/setup-chromedriver@v1 - - - name: Start chromedriver - run: | - export DISPLAY=:99 - chromedriver --port=4444 --no-sandbox --url-base=/wd/hub & - - name: PHPUNIT tests run: | cd $DRUPAL_DIR/web/core diff --git a/phpunit.xml b/phpunit.xml index 3e6e1562..a4091781 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -47,7 +47,7 @@ - +