Skip to content

Commit

Permalink
Removing hosting flag for acsf. (#471)
Browse files Browse the repository at this point in the history
  • Loading branch information
grasmash authored Oct 5, 2016
1 parent 8bc088e commit 6e05eb6
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 21 deletions.
4 changes: 1 addition & 3 deletions phing/tasks/acsf.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@

<target name="acsf:init" description="Initializes ACSF support for project.">
<echo>Adding acsf module as a dependency.</echo>
<exec dir="${repo.root}" command="composer require drupal/acsf:~8" logoutput="true" checkreturn="true" passthru="true" level="info"/>
<echo>Modifying project.yml.</echo>
<exec dir="${repo.root}" command="drupal yaml:update:value project.yml hosting acsf" logoutput="true" checkreturn="true" passthru="true" level="info"/>
<exec dir="${repo.root}" command="composer require drupal/acsf:^8" logoutput="true" checkreturn="true" passthru="true" level="info"/>
<echo>Executing initialization command for acsf module.</echo>
<drush command="acsf-init">
<option name="include">"${docroot}/modules/contrib/acsf/acsf_init"</option>
Expand Down
13 changes: 0 additions & 13 deletions phing/tasks/deploy.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,6 @@

<target name="deploy:build" description="Generates a deploy-ready build in deploy.dir."
depends="frontend, deploy:copy, deploy:composer:install, deploy:sanitize">
<!-- If we are using ACSF, run the ACSF Deploy command. -->
<if>
<equals arg1="${hosting}" arg2="acsf"/>
<then>
<phingcall target="deploy:acsf:init"/>
</then>
</if>

<!--Allow custom commands to be run before commit.-->
<phingcall target="target-hook:invoke">
<property name="hook-name" value="post-deploy-build"/>
Expand Down Expand Up @@ -156,9 +148,4 @@
</fileset>
</delete>
</target>

<target name="deploy:acsf:init" description="Re-initialize ACSF with the settings.php changes required for artifact." hidden="true">
<chmod file="${deploy.dir}/docroot/sites/default/settings.php" mode="0755" />
<exec dir="${deploy.dir}/docroot" command="${drush.bin} --include=${deploy.dir}/docroot/modules/contrib/acsf/acsf_init acsf-init -r ${deploy.dir}/docroot -y" logoutput="true" checkreturn="true" level="info" passthru="true"/>
</target>
</project>
1 change: 1 addition & 0 deletions src/Drush/Command/BltDoctorCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -811,6 +811,7 @@ protected function checkProjectYml() {
'project.vendor',
'project.description',
'project.themes',
'hosting',
];

$config = new Data($this->config);
Expand Down
5 changes: 0 additions & 5 deletions template/project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,3 @@ target-hooks:

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

# Hosting environment flags.
# Examples: acsf (Acquia Cloud Site Factory), ac (Acquia Cloud)
# hosting: "acsf"
# hosting: "ac"

0 comments on commit 6e05eb6

Please sign in to comment.