Skip to content

Commit

Permalink
Merge pull request #117 from onigra/fix_deprecation_warning
Browse files Browse the repository at this point in the history
Fix deprecation warning
  • Loading branch information
zzet authored Jan 21, 2018
2 parents 96247ec + 905e2c0 commit 973bce7
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ install:
script:
- echo localhost > inventory
- ansible-playbook --syntax-check -i inventory role.yml
- ansible-playbook -i inventory role.yml --connection=local --sudo -vvvv
- ansible-playbook -i inventory role.yml --connection=local --become -vvvv
os:
- linux
- linux
4 changes: 2 additions & 2 deletions role.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
- 'vars/main.yml'
- 'defaults/main.yml'
tasks:
- include: 'tasks/main.yml'
- import_tasks: 'tasks/main.yml'
handlers:
- include: 'handlers/main.yml'
- import_tasks: 'handlers/main.yml'
14 changes: 7 additions & 7 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
- name: include env vars
include_vars: "{{ rbenv.env }}.yml"

- include: apt_build_depends.yml
- import_tasks: apt_build_depends.yml
when: ansible_pkg_mgr == 'apt'
- include: yum_build_depends.yml
- import_tasks: yum_build_depends.yml
when: ansible_pkg_mgr == 'yum'
- include: dnf_build_depends.yml
- import_tasks: dnf_build_depends.yml
when: ansible_pkg_mgr == 'dnf'
# - include: pacman_build_depends.yml # Arch Linux
# - import_tasks: pacman_build_depends.yml # Arch Linux
# when: ansible_pkg_mgr == 'pacman'
- include: homebrew_build_depends.yml
- import_tasks: homebrew_build_depends.yml
when: ansible_os_family == 'Darwin'

- name: set rbenv_owner
Expand All @@ -20,7 +20,7 @@
set_fact: rbenv_tmpdir="{{ ansible_env.TMPDIR | default('/tmp') }}"
when: rbenv_tmpdir is undefined

- include: system_install.yml
- import_tasks: system_install.yml
when: rbenv.env == "system"
- include: user_install.yml
- import_tasks: user_install.yml
when: rbenv.env != "system"

0 comments on commit 973bce7

Please sign in to comment.