Skip to content
This repository was archived by the owner on Mar 5, 2025. It is now read-only.

Commit dc396b3

Browse files
authored
Removing blt init from more places. (#403)
1 parent e885202 commit dc396b3

File tree

5 files changed

+5
-16
lines changed

5 files changed

+5
-16
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -100,3 +100,4 @@ nbproject/*
100100
# Some files should be excluded from blt but not from the projects it
101101
# generates, so they must be specified here rather than in template/.gitignore.
102102
template/.idea/.name
103+
template/composer.lock

.travis.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,11 @@ script:
7272
# Commit so that susbsequent git commit tests have something to ammend.
7373
- git commit -m 'Initial commit.'
7474
# BLT is the only dependency at this point. Install it.
75-
- composer install
75+
- composer install -v
7676
- export PATH=$TRAVIS_BUILD_DIR/../blt-project/vendor/bin:$PATH
77-
- yes | blt init
7877
# The local.hostname must be set to 127.0.0.1:8888 because we are using drush runserver to run the site on Travis CI.
7978
- drupal yaml:update:value project.yml project.local.hostname '127.0.0.1:8888'
80-
# Running `blt init` modified composer.json, so we must update.
79+
# BLT added new dependencies for us, so we must update.
8180
- composer update
8281
# Create a .travis.yml, just to make sure it works. It won't be executed.
8382
- blt ci:travis:init

RELEASE.md

-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ This test verifies that a new project can be created using `acquia/blt-project`
1818
export COMPOSER_PROCESS_TIMEOUT=2000
1919
composer create-project acquia/blt-project blt8-release --no-interaction
2020
cd blt8-release
21-
blt init
2221
./vendor/bin/drupal yaml:update:value project.yml project.local.hostname 'blt8-release.localhost'
2322
echo '$databases["default"]["default"]["username"] = "drupal";' >> docroot/sites/default/settings/local.settings.php
2423
echo '$databases["default"]["default"]["password"] = "drupal";' >> docroot/sites/default/settings/local.settings.php
@@ -43,7 +42,6 @@ This test verifies that a new project can be created from scratch using blt, wit
4342
composer init --stability=dev --no-interaction
4443
composer config prefer-stable true
4544
composer require acquia/blt:8.x-dev
46-
blt init
4745
./vendor/bin/drupal yaml:update:value project.yml project.local.hostname 'blt8-release.localhost'
4846
composer update
4947
blt vm:init

phing/tasks/blt.xml

+2-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<project name="blt" default="update">
2-
<target name="create-project" depends="init">
2+
<target name="create-project" depends="update">
33
<exec dir="${repo.root}" command="git init" logoutput="true" checkreturn="true" level="info" passthru="true"/>
44
<echo>Updating composer dependencies, this make take a while...</echo>
55
<exec dir="${repo.root}" command="export COMPOSER_PROCESS_TIMEOUT=600; composer update" logoutput="true" checkreturn="true" level="info" passthru="true"/>
@@ -8,13 +8,6 @@
88
<exec dir="${repo.root}" command="rm LICENSE.txt" logoutput="true" checkreturn="true" level="info" passthru="true"/>
99
</target>
1010

11-
<target name="init" depends="blt:rsync-template, blt:update-composer, blt:update-yml, setup:drupal:settings">
12-
<echo>BLT files have been copied to your project directory.</echo>
13-
<echo>Some of your existing files may have been modified.</echo>
14-
<echo></echo>
15-
<echo>Please customize ${repo.root}/project.yml.</echo>
16-
</target>
17-
1811
<target name="blt:rsync-template">
1912
<echo>Copying files from BLT's template into your project.</echo>
2013
<!-- @todo Do not overwrite structured or executable files. Instead, update them intelligently settings.php, drush.wrapper etc. -->
@@ -24,8 +17,7 @@
2417
<exec dir="${repo.root}" command="rsync -a --no-g ${blt.root}/template/ ${repo.root}/ --include-from=${blt.update.ignore-existing-file} --ignore-existing" logoutput="true" checkreturn="true" level="info" passthru="true"/>
2518
</target>
2619

27-
<target name="update" depends="init">
28-
<!-- @todo Ignore some files, settings.php, project.yml, in update. Instead, change only specific values. -->
20+
<target name="update" depends="blt:rsync-template, blt:update-composer, blt:update-yml, setup:drupal:settings">
2921
<echo>Some of your customized files may have been modified.</echo>
3022
<echo>Please review changes with "git diff".</echo>
3123
<echo>If your composer.json was modified, you need to run "composer update".</echo>

src/Composer/Plugin.php

-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ protected function executeBltUpdate() {
120120
// @todo cd into project root from getVendorPath?
121121
$this->io->write('<info>Updating BLT templated files</info>');
122122
$this->executeCommand('blt update');
123-
$this->io->write('<info>BLT template files were updated</info>');
124123
$this->io->write('<comment>This may have modified your composer.json and require a subsequent `composer update`</comment>');
125124
}
126125

0 commit comments

Comments
 (0)