diff --git a/drupalci.yml b/drupalci.yml index d366f48b585dbbd89d9c18c37aee9bc3e5eec903..29bee715f5d4a39816d42034a272ece2b7dcad81 100644 --- a/drupalci.yml +++ b/drupalci.yml @@ -9,11 +9,6 @@ build: sniff-all-files: true halt-on-fail: true testing: - container_command: - commands: - - cd ${SOURCE_DIR} && sudo -u www-data curl https://www.drupal.org/files/issues/2019-10-07/3085728.patch | git apply - - - cd ${SOURCE_DIR} && sudo -u www-data curl https://www.drupal.org/files/issues/2019-10-16/3088400-8_0.patch | git apply - - - cd ${SOURCE_DIR} && sudo -u www-data curl https://www.drupal.org/files/issues/2019-10-16/3088447.patch | git apply - # run_tests task is executed several times in order of performance speeds. # halt-on-fail can be set on the run_tests tasks in order to fail fast. # suppress-deprecations is false in order to be alerted to usages of diff --git a/src/Services/InPlaceUpdate.php b/src/Services/InPlaceUpdate.php index 21ab7a14a64e4d549fe6d0ebec4a1c83fa9ec019..6a7e74f331c0b8d2d43557d0d31d07d2227fe4d6 100644 --- a/src/Services/InPlaceUpdate.php +++ b/src/Services/InPlaceUpdate.php @@ -149,8 +149,18 @@ class InPlaceUpdate implements UpdateInterface { $modified = $this->checkModifiedFiles($metadata, $archive); if (!$modified && $this->backup($archive, $project_root)) { $this->logger->info('In place update has started.'); - $success = $this->processUpdate($archive, $project_root); - $this->logger->info('In place update has finished.'); + try { + $success = $this->processUpdate($archive, $project_root); + $this->logger->info('In place update has finished.'); + } + catch (\Throwable $throwable) { + $this->logger->info('In place update failed.'); + watchdog_exception($throwable); + } + catch (\Exception $exception) { + $this->logger->info('In place update failed.'); + watchdog_exception($exception); + } if ($success) { $process = automatic_updates_console_command('updatedb:status'); if ($success && $process->getOutput()) {