Skip to content

Commit

Permalink
8.0.16 release
Browse files Browse the repository at this point in the history
* 8.0.16 pre release

* surround migration execution with try catch
  • Loading branch information
pookmish authored Jan 30, 2019
1 parent 470c758 commit b5bfab3
Show file tree
Hide file tree
Showing 44 changed files with 71 additions and 48 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'H&S Basic Page'
description: 'Basic Page content type'
core: 8.x
type: module
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
dependencies:
- entity_reference_revisions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'H&S Basic Page Display'
description: 'Basic Page content type'
core: 8.x
type: module
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
hidden: true
dependencies:
Expand Down
2 changes: 1 addition & 1 deletion docroot/modules/humsci/hs_blocks/hs_blocks.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'H&S Blocks'
type: module
description: 'Custom blocks for Humsci'
core: 8.x
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
dependencies:
- block
2 changes: 1 addition & 1 deletion docroot/modules/humsci/hs_bugherd/hs_bugherd.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'H&S Bugherd'
description: 'Bugherd API connection with JIRA'
core: 8.x
type: module
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
dependencies:
- encrypt
Expand Down
2 changes: 1 addition & 1 deletion docroot/modules/humsci/hs_capx/hs_capx.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'H&S CAPx'
description: 'Simple form to change the workgroup or organization for CAPx importer'
core: 8.x
type: module
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
dependencies:
- migrate_plus
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ name: 'H&S Config Prefix'
type: module
description: 'Prefix any configuration entities with a specified string'
core: 8.x
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'H&S Config Read Only'
description: 'Modify the Config Read Only to blacklist specific config'
core: 8.x
type: module
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
dependencies:
- config_readonly
Expand Down
2 changes: 1 addition & 1 deletion docroot/modules/humsci/hs_courses/hs_courses.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'H&S Courses'
type: module
description: 'Courses content type'
core: 8.x
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
dependencies:
- datetime
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'H&S Event Series'
description: 'Event Series content type'
core: 8.x
type: module
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
dependencies:
- hs_events
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'H&S Event Series Display'
description: 'Event Series content type'
core: 8.x
type: module
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
hidden: true
dependencies:
Expand Down
2 changes: 1 addition & 1 deletion docroot/modules/humsci/hs_events/hs_events.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'H&S Events'
description: 'Events content type'
core: 8.x
type: module
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
dependencies:
- allowed_formats
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'H&S Events Display'
description: 'Events content type'
core: 8.x
type: module
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
hidden: true
dependencies:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'H&S Events Importer'
description: 'Migrate importer for stanford events.'
core: 8.x
type: module
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
dependencies:
- hs_events
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'H&S Field Helpers'
type: module
description: 'Additional field widgets and display formatters'
core: 8.x
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
dependencies:
- ui_patterns_views
Expand Down
2 changes: 1 addition & 1 deletion docroot/modules/humsci/hs_layouts/hs_layouts.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'H&S Layouts'
type: module
description: 'Layout options for H&S'
core: 8.x
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
dependencies:
- layout_discovery
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'H&S Masquerade'
type: module
description: 'Provide a masquerade page and menu link'
core: 8.x
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
dependencies:
- masquerade
19 changes: 13 additions & 6 deletions docroot/modules/humsci/hs_migrate/hs_migrate.module
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,6 @@ function hs_migrate_cron() {
* @param array $options
* Array of options to pass into the migration import.
*
* @throws \Drupal\migrate\MigrateException
*
* @see \Drupal\migrate_tools\Commands\MigrateToolsCommands::executeMigration()
*/
function hs_migrate_execute_migration(MigrationInterface $migration, $migration_id, array $options = []) {
Expand All @@ -135,10 +133,19 @@ function hs_migrate_execute_migration(MigrationInterface $migration, $migration_
}

// Finally run this migration.
$log = new MigrateMessage();
$executable = new MigrateExecutable($migration, $log, $options);
$executable->import();
$executed_migrations[$migration_id] = $migration_id;
try {
$log = new MigrateMessage();
$executable = new MigrateExecutable($migration, $log, $options);
$executable->import();
$executed_migrations[$migration_id] = $migration_id;
}
catch (Exception $e) {
\Drupal::logger('hs_migrate')
->critical('Unable to execute importer @id: @message', [
'@id' => $migration_id,
'@message' => $e->getMessage(),
]);
}
}

/**
Expand Down
2 changes: 1 addition & 1 deletion docroot/modules/humsci/hs_news/hs_news.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'H&S News'
type: module
description: 'News content type'
core: 8.x
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
dependencies:
- file
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'H&S News Display'
type: module
description: 'News content type'
core: 8.x
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
hidden: true
dependencies:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'H&S Paragraph Types'
description: 'Generic Helpers for paragraphs.'
core: 8.x
type: module
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
dependencies:
- paragraphs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'H&S Hero Image Paragraph'
description: 'Hero Image Paragraph type'
core: 8.x
type: module
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
dependencies:
- entity_browser
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'H&S Hero Image Paragraph Display'
description: 'Hero Image Paragraph type'
core: 8.x
type: module
version: 8.x
version: 8.0.16
hidden: true
package: 'Humanities & Sciences'
dependencies:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: H&S Postcard Paragraph
description: A paragraph type with a postcard display.
core: 8.x
type: module
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
dependencies:
- media
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: H&S Postcard Display
description: A paragraph type with a postcard display.
core: 8.x
type: module
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
hidden: true
dependencies:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: H&S Row Paragraph
description: A paragraph type with a simple image.
core: 8.x
type: module
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
dependencies:
- allowed_formats
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: H&S Row Paragraph Display
description: A paragraph type with a simple image.
core: 8.x
type: module
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
hidden: true
dependencies:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: H&S Slide Paragraph
description: A paragraph type with a simple image.
core: 8.x
type: module
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
dependencies:
- allowed_formats
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'H&S Slide Paragraph Display'
description: 'A paragraph type with a simple image.'
core: 8.x
type: module
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
hidden: true
dependencies:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: H&S Slideshow Paragraph
description: A paragraph type with a slideshow.
core: 8.x
type: module
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
dependencies:
- entity_reference_revisions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'H&S Slideshow Paragraph Display'
description: 'A paragraph type with a slideshow.'
core: 8.x
type: module
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
hidden: true
dependencies:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'H&S Text Area Paragraph'
description: 'Text Area Paragraph type'
core: 8.x
type: module
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
dependencies:
- paragraphs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'H&S Text Area Paragraph Display'
description: 'Text Area Paragraph type'
core: 8.x
type: module
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
hidden: true
dependencies:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'H&S View Paragraph'
description: 'View Paragraph type'
core: 8.x
type: module
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
dependencies:
- paragraphs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'H&S View Paragraph Display'
description: 'View Paragraph type'
core: 8.x
type: module
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
hidden: true
dependencies:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'H&S Webform Paragraph'
description: 'Webform Paragraph type'
core: 8.x
type: module
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
dependencies:
- paragraphs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ description: Allows the addition of paragraphs between existing ones.
core: 8.x
package: 'Humanities & Sciences'
type: module
version: 8.x
version: 8.0.16
dependencies:
- drupal:paragraphs
2 changes: 1 addition & 1 deletion docroot/modules/humsci/hs_person/hs_person.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'H&S Person'
type: module
description: 'Person content type'
core: 8.x
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
dependencies:
- address
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'H&S Person Display'
type: module
description: 'Publications content type'
core: 8.x
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
hidden: true
dependencies:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'H&S Publications'
type: module
description: 'Publications content type'
core: 8.x
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
dependencies:
- datetime
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'H&S Publications Display'
type: module
description: 'Publications content type'
core: 8.x
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
hidden: true
dependencies:
Expand Down
2 changes: 1 addition & 1 deletion docroot/modules/humsci/hs_research/hs_research.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'H&S Reesarch'
type: module
description: 'Research content type'
core: 8.x
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
dependencies:
- field
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'H&S Research Display'
type: module
description: 'Publications content type'
core: 8.x
version: 8.x
version: 8.0.16
package: 'Humanities & Sciences'
hidden: true
dependencies:
Expand Down
Loading

0 comments on commit b5bfab3

Please sign in to comment.