diff --git a/phing/build.yml b/phing/build.yml index 749e67abb..c0699d220 100644 --- a/phing/build.yml +++ b/phing/build.yml @@ -19,7 +19,8 @@ composer: deploy: dir: ${repo.root}/deploy - exclude_file: ${repo.root}/build/core/files/deploy-exclude.txt + exclude_file: ${blt.root}/phing/files/deploy-exclude.txt + gitignore_file: ${blt.root}/phing/files/.gitignore # File and Directory locations. docroot.relative: ${repo.root.relative}/docroot diff --git a/phing/tasks/deploy.xml b/phing/tasks/deploy.xml index 80735ae6b..4d1d431f6 100644 --- a/phing/tasks/deploy.xml +++ b/phing/tasks/deploy.xml @@ -105,7 +105,7 @@ - + diff --git a/phing/tasks/tests.xml b/phing/tasks/tests.xml index a04544dcc..6ff38d09c 100644 --- a/phing/tasks/tests.xml +++ b/phing/tasks/tests.xml @@ -3,7 +3,7 @@ + depends="tests:security-updates, tests:phpunit, tests:behat"/> diff --git a/scripts/blt/convert-to-composer.sh b/scripts/blt/convert-to-composer.sh index d871fae55..1761b4f8e 100644 --- a/scripts/blt/convert-to-composer.sh +++ b/scripts/blt/convert-to-composer.sh @@ -11,3 +11,5 @@ rm -rf build bolt.sh tests/phpunit/blt ./vendor/acquia/blt/blt.sh install-alias blt init blt configure + +# Move build/custom/files to new locations (e.g., deploy excludes or .gitignores). diff --git a/template/composer.json b/template/composer.json index 1a12eb8a0..aacaa742d 100644 --- a/template/composer.json +++ b/template/composer.json @@ -43,8 +43,6 @@ "Drupal\\Tests\\PHPUnit\\": "tests/phpunit/src/" } }, - "minimum-stability": "dev", - "prefer-stable": true, "extra": { "installer-paths": { "docroot/core": ["type:drupal-core"], @@ -67,5 +65,7 @@ "post-update-cmd": [ "PhantomInstaller\\Installer::installPhantomJS" ] - } + }, + "minimum-stability": "dev", + "prefer-stable": true }