diff --git a/CHANGELOG.md b/CHANGELOG.md index b28e00eed1..6b8e07c6d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ ### HEAD +* Use ansible-role-composer ([#491](https://github.com/roots/trellis/pull/491)) * Fix bad `curl` output ([#490](https://github.com/roots/trellis/pull/490)) * Fixes #410 - Default to 1 CPU in Vagrant ([#487](https://github.com/roots/trellis/pull/487)) diff --git a/requirements.yml b/requirements.yml index 539ecd85d7..0a30e4c94a 100644 --- a/requirements.yml +++ b/requirements.yml @@ -1,3 +1,7 @@ +- name: composer + src: geerlingguy.composer + version: 1.2.7 + - name: ntp src: resmo.ntp version: 0.3.0 diff --git a/roles/composer/tasks/main.yml b/roles/composer/tasks/main.yml deleted file mode 100644 index 131b5a9d07..0000000000 --- a/roles/composer/tasks/main.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -- name: Install Composer - get_url: - url: "https://getcomposer.org/composer.phar" - dest: /usr/local/bin/composer - mode: 0755 - -- name: Composer self update - command: composer self-update - register: composer_update_result - changed_when: composer_update_result | success and 'already using composer version' not in composer_update_result.stderr - -- name: Composer config github-oauth - command: composer config -g github-oauth.github.com {{ composer_github_oauth_token }} - when: composer_github_oauth_token is defined