diff --git a/template/build/core/phing/build.xml b/template/build/core/phing/build.xml index 8f7df1ad9..41f90f53c 100644 --- a/template/build/core/phing/build.xml +++ b/template/build/core/phing/build.xml @@ -57,4 +57,27 @@ + + + + + + + + + + + + + The directory ${scripts.${task-name}.dir} does not exist. Will not run command for ${task-name}. + + + + + No commands are defined for ${task-name}. Skipping. + + + + + diff --git a/template/build/core/phing/tasks/deploy.xml b/template/build/core/phing/tasks/deploy.xml index 13e0615a3..61e662cb5 100644 --- a/template/build/core/phing/tasks/deploy.xml +++ b/template/build/core/phing/tasks/deploy.xml @@ -26,6 +26,13 @@ + + + + + + + @@ -63,7 +70,7 @@ + depends="frontend:build, deploy:copy, deploy:composer:install, deploy:sanitize"> @@ -90,21 +97,6 @@ - - - - - - - - "${profile.dir}/drupal-org.make" - "${profile.dir}" - - - - - - diff --git a/template/build/core/phing/tasks/frontend.xml b/template/build/core/phing/tasks/frontend.xml index 70f356932..b8d90e9b1 100644 --- a/template/build/core/phing/tasks/frontend.xml +++ b/template/build/core/phing/tasks/frontend.xml @@ -1,53 +1,9 @@ - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/template/build/core/phing/tasks/setup.xml b/template/build/core/phing/tasks/setup.xml index f23d4220c..8a314c510 100644 --- a/template/build/core/phing/tasks/setup.xml +++ b/template/build/core/phing/tasks/setup.xml @@ -17,22 +17,12 @@ - + depends="setup:git-hooks, setup:drupal:settings, setup:behat, setup:composer:install, frontend:build"> + + + + - - - - - - - - - "${profile.dir}/drupal-org.make" - ${profile.dir} - - - diff --git a/template/project.yml b/template/project.yml index 304871a90..7a5a88740 100644 --- a/template/project.yml +++ b/template/project.yml @@ -40,6 +40,22 @@ drush: # The default drush alias to be used when no environment is specified. default_alias: ${drush.aliases.local} +# Custom tasks that are triggered at pre-defined times in the build process. +# Available keys are setup, frontend. +tasks: + # Executed after setup:build:all is run. + setup: + dir: ${docroot}/profiles/contrib/lighting + command: npm install && bower install + # Executed when front end assets should be generated. + frontend: + dir: ${docroot}/sites/all/themes/contrib/thunder + command: npm run build + # Executed after deployment artifact is created. + deploy: + dir: ${deploy.dir} + command: cd docroot/profiles/contrib/lightning && npm install && bower install + # Hosting environment flags. # Examples: acsf (Acquia Cloud Site Factory), ac (Acquia Cloud) # hosting: "acsf"