Skip to content

Commit d0cdb6d

Browse files
committed
Fixes acquia#1177 acquia#1176: Cloud hooks cause warnings and errors.
1 parent 464e4c4 commit d0cdb6d

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

phing/tasks/deploy.xml

+8-4
Original file line numberDiff line numberDiff line change
@@ -239,15 +239,19 @@
239239

240240
<!-- Wrapper for setup:update that sets some environment-specific variables first. -->
241241
<target name="deploy:update" description="Update current database to reflect the state of the Drupal file system; uses local drush alias.">
242+
<foreach list="${multisite.name}" param="deploy.site.name" target="deploy:update:site"/>
243+
</target>
244+
245+
<target name="deploy:update:site" description="Update current database to reflect the state of the Drupal file system; uses local drush alias.">
242246
<phingcall target="setup:update">
243247
<!-- Drush fails to include some files. @see https://github.com/drush-ops/drush/issues/2497#issuecomment-279049111 -->
244248
<property name="drush.bin" value="${drush.bin} --include=../drush" override="true" />
245249
<!-- Environment parameter is used to determine which modules to toggle. On ACE, will be overridden by one of dev/stage/prod. -->
246250
<param name="environment" value="deploy"/>
247-
<!-- Drush alias should be set to sites to update all sites. -->
248-
<property name="drush.alias" value="sites"/>
249-
<!-- Kill Drush uri, since we want to run updates against all sites. -->
250-
<property name="drush.uri" value=""/>
251+
<!-- Drush alias should be set to sites to update any sites. -->
252+
<property name="drush.alias" value=""/>
253+
<!-- Kill Drush uri, since we want to run updates against all site. -->
254+
<property name="drush.uri" value="${deploy.site.name}"/>
251255
<!-- Most sites store their version-controlled configuration in /config/default. -->
252256
<!-- ACE internally sets the vcs configuration directory to /config/default, so we use that. -->
253257
<property name="cm.core.config-dir.key" value="${cm.core.config-dir.deploy-key}"/>

phing/tasks/properties.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@
6666
<if>
6767
<available file="${docroot}/sites"/>
6868
<then>
69-
<!-- Find directories in ${docroot}/sites/*/ and format into a comma-separated list. -->
70-
<exec command="find ${docroot}/sites/* -maxdepth 0 -type d | sed -e 's%${docroot}/sites/%%g' -e '2,$s%^%,%' | tr -d '\n'"
69+
<!-- Find directories in ${docroot}/sites/*/ and format into a comma-separated list. Exclude ${docroot}/sites/g. -->
70+
<exec command="find ${docroot}/sites/* -maxdepth 0 -type d | grep -v -e '${docroot}/sites/g$' | sed -e 's%${docroot}/sites/%%g' -e '2,$s%^%,%' | tr -d '\n'"
7171
outputProperty="multisite.name" logoutput="false" checkreturn="true"/>
7272
</then>
7373
<else>

template/hooks/common/slack.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ if [ -f $FILE ]; then
1818
fi
1919
fi
2020
else
21-
echo "File $FILE does not exist."
21+
echo "Notice: Slack notifications disabled: file $FILE does not exist."
2222
fi

tests/phpunit/phpunit.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<php>
66
<const name="BLT_ENV" value="ci"/>
77
<const name="BLT_ALIAS" value="self"/>
8-
<const name="BLT_MULTISITE_NAME" value="default,g"/>
8+
<const name="BLT_MULTISITE_NAME" value="default"/>
99
</php>
1010

1111
</phpunit>

0 commit comments

Comments
 (0)