From 747beb3f85f30f03334ce1258b959855d9219db4 Mon Sep 17 00:00:00 2001 From: Sonny Kieu Date: Fri, 1 Mar 2019 14:48:46 +1100 Subject: [PATCH] Added Config ignore. --- composer-lagoon.json | 1 + composer.json | 8 +++++++- config/install/config_ignore.settings.yml | 8 ++++++++ drupal-org.make | 3 +++ govcms.info.yml | 1 + 5 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 config/install/config_ignore.settings.yml diff --git a/composer-lagoon.json b/composer-lagoon.json index 402544ed1..858b97c2b 100644 --- a/composer-lagoon.json +++ b/composer-lagoon.json @@ -62,6 +62,7 @@ "patchLevel": { "drupal/core": "-p2" }, + "enable-patching": true, "installer-types": ["bower-asset", "npm-asset"], "installer-paths": { "web/core": [ diff --git a/composer.json b/composer.json index ebab5fa7e..6476bc442 100644 --- a/composer.json +++ b/composer.json @@ -32,6 +32,7 @@ "drupal/chosen": "2.6.0", "drupal/components": "1.0.0", "drupal/config_filter": "1.4", + "drupal/config_ignore": "2.1", "drupal/config_split": "1.4", "drupal/config_update": "1.6", "drupal/consumers": "1.4", @@ -129,7 +130,12 @@ "docroot/libraries/{$name}": ["type:drupal-library", "type:bower-asset", "type:npm-asset"], "drush/contrib/{$name}": ["type:drupal-drush"] }, - "patches": {} + "enable-patching": true, + "patches": { + "drupal/config_ignore": { + "Offset error within IgnoreFilter::activeReadMultiple() - https://www.drupal.org/project/config_ignore/issues/2972302": "https://www.drupal.org/files/issues/2018-07-31/offset-error-within-2972302-13.patch" + } + } }, "autoload": { "psr-4": { diff --git a/config/install/config_ignore.settings.yml b/config/install/config_ignore.settings.yml new file mode 100644 index 000000000..255e2be48 --- /dev/null +++ b/config/install/config_ignore.settings.yml @@ -0,0 +1,8 @@ +ignored_config_entities: + - 'clamav.settings' + - 'login_security.settings' + - 'password_policy.*' + - 'seckit.settings' + - 'system.menu.*' + - 'webform.webform.*' + - 'webform.webform_options.*' diff --git a/drupal-org.make b/drupal-org.make index e129fd2c5..80e186cc4 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -15,6 +15,9 @@ projects[components][type] = module projects[components][version] = 1.0 projects[config_filter][type] = module projects[config_filter][version] = 1.4 +projects[config_ignore][type] = module +projects[config_ignore][version] = 2.1 +projects[config_ignore][patch][] = https://www.drupal.org/files/issues/2018-07-31/offset-error-within-2972302-13.patch projects[config_split][type] = module projects[config_split][version] = 1.4 projects[config_update][type] = module diff --git a/govcms.info.yml b/govcms.info.yml index f94c1a476..229c689a7 100644 --- a/govcms.info.yml +++ b/govcms.info.yml @@ -44,6 +44,7 @@ dependencies: - ds - chosen - components + - config_ignore:config_ignore - entity_browser - entity_embed - features_ui