Skip to content

Commit

Permalink
Fixed composer installs packages with commit refs. (#606)
Browse files Browse the repository at this point in the history
  • Loading branch information
danepowell authored and grasmash committed Oct 31, 2016
1 parent 6c786a9 commit 5f44b74
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion phing/tasks/deploy.xml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
<include name="composer.lock"/>
</fileset>
</copy>
<exec dir="${deploy.dir}" command="export COMPOSER_EXIT_ON_PATCH_FAILURE=1; composer install --no-dev --prefer-dist --no-interaction --optimize-autoloader" logoutput="true" checkreturn="true" level="${blt.exec_level}" passthru="true"/>
<exec dir="${deploy.dir}" command="export COMPOSER_EXIT_ON_PATCH_FAILURE=1; composer install --no-dev --no-interaction --optimize-autoloader" logoutput="true" checkreturn="true" level="${blt.exec_level}" passthru="true"/>
</then>
<else>
<echo>Dependencies will not be built because deploy.build-dependencies is not enabled.</echo>
Expand Down
2 changes: 1 addition & 1 deletion phing/tasks/setup.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

<target name="setup:composer:install" description="Installs project dependencies, including drupal core and contrib.">
<!-- Prefer distributions locally so that the downloaded archives are cached. -->
<exec dir="${repo.root}" command="export COMPOSER_EXIT_ON_PATCH_FAILURE=1; composer install --ansi --no-interaction --prefer-dist" logoutput="true" checkreturn="true" level="${blt.exec_level}" passthru="true" />
<exec dir="${repo.root}" command="export COMPOSER_EXIT_ON_PATCH_FAILURE=1; composer install --ansi --no-interaction" logoutput="true" checkreturn="true" level="${blt.exec_level}" passthru="true" />
</target>

<!-- We intentionally do not run setup:behat because we'd like to delay setting values in local.yml until just before they are run. -->
Expand Down

0 comments on commit 5f44b74

Please sign in to comment.