Update drush to 13 and remove previous update DREVOPS_PROVISION_SANIT…

…IZE_DB_SKIP logic.
drevops · Jun 18, 2024 · 2673477 · 2673477 · github-actions · Jun 18, 2024
1 parent a096392
commit 2673477
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
         "drupal/search_api_solr": "^4.3",
         "drupal/shield": "^1.7",
         "drupal/stage_file_proxy": "^2.1",
-        "drush/drush": "^12.5",
+        "drush/drush": "^13",
         "oomphinc/composer-installers-extender": "^2.0",
         "vlucas/phpdotenv": "^5.6",
         "webflo/drupal-finder": "^1.2"
@@ -149,9 +149,6 @@
             "drupal/core": "-p2"
         },
         "patches": {
-          "drupal/search_api_solr": {
-            "Fatal error Declaration of Drupal\\search_api_solr\\Plugin\\search_api\\backend\\SearchApiSolrBackend::__sleep()": "https://www.drupal.org/files/issues/2024-06-17/search-api-solr-fatal-error-declaration-of-sleep-3449292-12.patch"
-          },
           "drupal/search_api": {
             "Declaration of Drupal\\search_api_solr\\Plugin\\search_api\\backend\\SearchApiSolrBackend::__sleep() must be compatible": "https://git.drupalcode.org/project/search_api/-/merge_requests/148.patch",
             "Declaration of Drupal\\Core\\DependencyInjection\\DependencySerializationTrait::__wakeup() must be compatible": "https://www.drupal.org/files/issues/2024-06-18/type_declaration.patch"

diff --git a/scripts/drevops/provision.sh b/scripts/drevops/provision.sh
@@ -25,9 +25,6 @@ DREVOPS_PROVISION_OVERRIDE_DB="${DREVOPS_PROVISION_OVERRIDE_DB:-0}"
 
 # Skip database sanitization.
 DREVOPS_PROVISION_SANITIZE_DB_SKIP="${DREVOPS_PROVISION_SANITIZE_DB_SKIP:-0}"
-if [ "${DREVOPS_PROVISION_USE_PROFILE}" = "1" ]; then
-  DREVOPS_PROVISION_SANITIZE_DB_SKIP=1
-fi
 
 # Put the site into a maintenance mode during site provisioning phase.
 DREVOPS_PROVISION_USE_MAINTENANCE_MODE="${DREVOPS_PROVISION_USE_MAINTENANCE_MODE:-1}"