Skip to content
This repository was archived by the owner on Mar 5, 2025. It is now read-only.

Added features bundle argument. #479

Merged
merged 3 commits into from
Oct 5, 2016
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion phing/tasks/setup.xml
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,9 @@
<param>drush</param>
</drush>
<!-- Revert all features. -->
<drush command="fra" assume="yes" alias="${drush.alias}"/>
<drush command="fra" assume="yes" alias="${drush.alias}">
<option name="bundle">${cm.features.bundle}</option>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this be optional? Will it fail if the cm.features.bundle is unset?

</drush>
<!-- Rebuild caches. -->
<drush command="cr" alias="${drush.alias}"/>
</target>
Expand Down
4 changes: 4 additions & 0 deletions template/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"drupal/cog": "~8",
"drupal/console": "1.0.0-beta5",
"drupal/core": "~8",
"drupal/features": "~8.3.0-beta9",
"drupal/lightning": "~8",
"drupal/memcache" : "8.*",
"drupal/search_api": "8.1.0-alpha14",
Expand Down Expand Up @@ -56,6 +57,9 @@
"patches": {
"drupal/core": {
"Ignore front end vendor folders to improve directory search performance": "https://www.drupal.org/files/issues/ignore_front_end_vendor-2329453-116.patch"
},
"drupal/features": {
"Bundle support": "https://www.drupal.org/files/issues/features-2808303-2.patch"
}
}
},
Expand Down
5 changes: 5 additions & 0 deletions template/project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ target-hooks:
dir: ${docroot}/profiles/contrib/lightning
command: npm run install-libraries

# Configuration management options, such as core CM or features.
cm:
features:
bundle: blted8
Copy link
Contributor

@grasmash grasmash Sep 30, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this is now required, is that correct? What will this do to existing projects that don't have this defined?

Maybe we should just use ${project.machine_name} rather than creating a new variable. Is there value in being able to customize it?


# Define any custom Phing files that you'd like to import. E.g., ${repo.root}/blt/phing/build.xml
import: ~

Expand Down