Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tweaking output to remove more passthru. #941

Merged
merged 1 commit into from
Jan 9, 2017
Merged

Tweaking output to remove more passthru. #941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion phing/tasks/blt.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,18 @@
<!-- Remove default git remote -->
<exec dir="${repo.root}" command="${composer.bin}/yaml-cli update:value ${blt.config-files.project} git.remotes.0 ''" logoutput="true" checkreturn="false" level="${blt.exec_level}" passthru="true"/>

<echo>Updating composer dependencies, this make take a while...</echo>
<echo>Installing new Composer dependencies provided by BLT. This make take a while...</echo>
<exec dir="${repo.root}" command="composer update --no-interaction" logoutput="true" checkreturn="true" level="${blt.exec_level}" passthru="true"/>
<copy file="${repo.root}/docroot/profiles/contrib/lightning/lightning.extend.yml" tofile="${repo.root}/docroot/sites/default/lightning.extend.yml"/>

<phingcall target="create-project:init-repo"/>

<!-- Display BLT art. -->
<exec dir="${repo.root}" command="cat ${blt.root}/scripts/blt/ascii-art.txt" logoutput="true" passthru="true" checkreturn="false"/>

<echo level="warning">Your new BLT-based project has been created in ${repo.root}.</echo>
<echo>Please continue by following the "Creating a new project with BLT" instructions:</echo>
<echo>http://blt.readthedocs.io/en/8.x/readme/creating-new-project/</echo>
</target>

<!-- This target is necessary because Composer will delete .git directory directly after the `composer create-project` -->
Expand Down
2 changes: 1 addition & 1 deletion phing/tasks/setup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@

<!-- Rebuild caches in case service definitions have changed. -->
<!-- @see https://www.drupal.org/node/2826466 -->
<drush command="cr" alias="${drush.alias}"/>
<drush command="cr" alias="${drush.alias}" passthru="false"/>

<!-- Import configuration before executing updates, in case any db updates are dependent on new configs to be imported. -->
<drush command="config-import" assume="yes" alias="${drush.alias}" passthru="false">
Expand Down
1 change: 0 additions & 1 deletion tests/phpunit/BltProject/GitTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ protected function assertCommitMessageValidity($is_valid, $commit_message, $mess

// "2>&1" redirects standard error output to standard output.
$command = "mkdir -p {$this->projectDirectory}/tmp && echo '$commit_message' > {$this->projectDirectory}/tmp/blt_commit_msg && {$this->projectDirectory}/.git/hooks/commit-msg {$this->projectDirectory}/tmp/blt_commit_msg 2>&1";
print "Executing \"$command\" \n";

exec($command, $output, $return);
$this->assertNotSame($is_valid, (bool) $return, $message);
Expand Down