combined ajax fix patch (#52)

thunder · Oct 5, 2021 · e00d55b · e00d55b
1 parent 604dfdf
commit e00d55b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 70 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/.travis.yml.dist b/.travis.yml.dist
diff --git a/lib/stages/build.sh b/lib/stages/build.sh
@@ -26,17 +26,18 @@ _stage_build() {
     installed_version=$(composer show 'drupal/core' | grep 'versions' | grep -o -E '[^ ]+$')
     major_version="$(cut -d'.' -f1 <<<"${installed_version}")"
     minor_version="$(cut -d'.' -f2 <<<"${installed_version}")"
-    if [[ ${major_version} -gt 8 ]] && [[ ${minor_version} -gt 0 ]]; then
+    if [[ ${major_version} -gt 8 ]] && [[ ${minor_version} -gt 1 ]]; then
         composer require phpspec/prophecy-phpunit:^2 --working-dir="${DRUPAL_TESTING_DRUPAL_INSTALLATION_DIRECTORY}"
         # Apply core patch
-        #local docroot
-        #docroot=$(get_distribution_docroot)
-        #cd "${docroot}" || exit
-        #wget https://www.drupal.org/files/issues/2020-12-04/3186443-1.patch
-        #patch -p1 < 3186443-1.patch
-        #cd - || exit
+        local docroot
+        docroot=$(get_distribution_docroot)
+        cd "${docroot}" || exit
+        wget https://www.drupal.org/files/issues/2021-10-05/3240601%2B3240813-9.2.x.patch
+        patch -p1 < 3240601+3240813-9.2.x.patch
+        cd - || exit
     fi
 
+
     # We can cleanup the name change now.
     composer config name "${DRUPAL_TESTING_COMPOSER_NAME}" --working-dir="${DRUPAL_TESTING_PROJECT_BASEDIR}"