Merge pull request #886 from rosiel/no-drupal-10

[CI] Test matrix: remove php7.3, mysql5.7.
2 years ago · 3c194cc7b7
4 changed files with 15 additions and 94 deletions
--- a/.github/workflows/build-2.x.yml
+++ b/.github/workflows/build-2.x.yml
@ -19,96 +19,19 @@ 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:
-        php-versions: ["7.3", "7.4"]
+        # 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-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]
-        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 }}

@ -175,7 +98,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: |
@ -190,18 +112,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 }}

--- 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)
--- 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",
--- 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);
  }