Skip to content

Commit

Permalink
Fixing build errors in BLT CI.
Browse files Browse the repository at this point in the history
  • Loading branch information
grasmash committed Jan 31, 2017
1 parent 0755ecf commit 6c36f6e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 8 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,9 @@ script:
- cd ../blt
# Run 'blt' phpunit tests, excluding deploy-push tests.
- phpunit tests/phpunit --group blt --exclude-group deploy-push
# Defining git remotes allows builds deployed via CI.
- yaml-cli update:value blt/project.yml git.remotes.0 [email protected]:bolt8.git
- yaml-cli update:value blt/project.yml git.remotes.1 https://github.com/acquia-pso/blted8.git

deploy:
provider: script
Expand Down
4 changes: 0 additions & 4 deletions phing/tasks/blt.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@
<exec dir="${repo.root}" command="result=${PWD##*/}; printf '%s\n' &quot;${PWD##*/}&quot;" logoutput="false" checkreturn="true" level="${blt.exec_level}" passthru="false" outputProperty="dirname"/>
<exec dir="${repo.root}" command="${composer.bin}/yaml-cli update:value ${blt.config-files.project} project.machine_name '${dirname}'" logoutput="true" checkreturn="false" level="${blt.exec_level}" passthru="true"/>

<!-- 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"/>
<exec dir="${repo.root}" command="${composer.bin}/yaml-cli unset:key ${blt.config-files.project} git.remotes.1" logoutput="true" checkreturn="false" level="${blt.exec_level}" passthru="true"/>

<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"/>
Expand Down
5 changes: 1 addition & 4 deletions template/blt/project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@ project:
# Configuration settings for new git repository.
git:
default_branch: master
remotes:
# Defining git remotes allows builds deployed via CI.
- [email protected]:bolt8.git
- https://github.com/acquia-pso/blted8.git
remotes: []

drush:
# You can set custom project aliases in drush/site-aliases/aliases.drushrc.php.
Expand Down

0 comments on commit 6c36f6e

Please sign in to comment.