GH-7: Remove core patch in test build.

.gitignore

@@ -5,3 +5,4 @@ build/
 phpunit.xml
 behat.yml
 docker-compose.yml
+/*.patch

.travis.yml

@@ -14,9 +14,9 @@ env:
   global:
   - DOCKER_COMPOSE_VERSION=1.17.1
   matrix:
-  - DRUPAL_VERSION=~8.6
-  - DRUPAL_VERSION=~8.7
-  - DRUPAL_VERSION=8.8.x-dev
+  - DRUPAL_VERSION=~8.8
+  - DRUPAL_VERSION=~8.9
+  - DRUPAL_VERSION=8.9.x-dev
 
 matrix:
   allow_failures:

composer.json

@@ -16,7 +16,6 @@
     "issues": "https://www.drupal.org/project/issues/file_link",
     "source": "http://cgit.drupalcode.org/file_link"
   },
-  "require": { },
   "require-dev": {
     "composer/installers": "^1.2",
     "cweagans/composer-patches": "~1.0",
@@ -32,11 +31,6 @@
     "post-update-cmd": "./vendor/bin/run drupal:site-setup"
   },
   "extra": {
-    "patches": {
-      "drupal/core": {
-        "https://www.drupal.org/project/drupal/issues/2943172": "https://www.drupal.org/files/issues/2018-07-05/2943172-kernel-test-base-3.patch"
-      }
-    },
     "installer-paths": {
       "build/core": ["type:drupal-core"],
       "build/modules/contrib/{$name}": ["type:drupal-module"],

runner.yml.dist

@@ -20,8 +20,13 @@ drupal:
       extension_discovery_scan_tests: true
 
 commands:
+  drupal:patch-core:
+    - { task: "remove", file: "2943172-kernel-test-base-60.patch" }
+    - 'wget https://www.drupal.org/files/issues/2021-01-27/2943172-kernel-test-base-60.patch'
+    - 'patch -N -d build -p1 < 2943172-kernel-test-base-60.patch || true'
   drupal:site-setup:
     - { task: "symlink", from: "../../..", to: "${drupal.root}/modules/custom/file_link" }
+    - { task: "run", command: "drupal:patch-core" }
     - { task: "run", command: "drupal:drush-setup" }
     - { task: "run", command: "drupal:settings-setup" }
     - { task: "run", command: "setup:phpunit" }