Skip to content

Commit

Permalink
Merge pull request #8 from fubarhouse/deprecation-notices
Browse files Browse the repository at this point in the history
Deprecation notices
  • Loading branch information
fubarhouse authored Apr 28, 2018
2 parents c6d8554 + ee6dc39 commit 97a71b7
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 11 deletions.
14 changes: 9 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ env:
init: /sbin/init
run_opts: --privileged
playbook: playbook.yml
# - distro: yakkety
# init: /sbin/init
# run_opts: --privileged
# playbook: playbook.yml
- distro: yakkety
init: /sbin/init
run_opts: --privileged
playbook: playbook.yml
- distro: zesty
init: /sbin/init
run_opts: --privileged
Expand Down Expand Up @@ -100,6 +100,10 @@ env:
init: /usr/lib/systemd/systemd
run_opts: --privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro
playbook: playbook.yml
- distro: fedora-28
init: /usr/lib/systemd/systemd
run_opts: --privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro
playbook: playbook.yml

before_install:

Expand All @@ -122,7 +126,7 @@ script:
- idempotence=$(mktemp)
- >
docker exec "$(cat ${container_id})"
ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} --sudo -vvvv
ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} --sudo
| tee -a ${idempotence}
- >
tail ${idempotence}
Expand Down
5 changes: 3 additions & 2 deletions meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ galaxy_info:
author: fubarhouse
description: Installs Yarn JS package manager.
license: "license (BSD, MIT)"
min_ansible_version: 2.1.0.0
min_ansible_version: 2.4
platforms:
- name: Debian
versions:
Expand All @@ -23,6 +23,7 @@ galaxy_info:
- 25
- 26
- 27
- 28
- name: Ubuntu
versions:
- precise
Expand All @@ -34,7 +35,7 @@ galaxy_info:
- wily
- vivid
- xenial
# - yakkety
- yakkety
- zesty
- artful
- bionic
Expand Down
4 changes: 2 additions & 2 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
when: fubarhouse_user_dir is not defined

- name: "Include tasks for Yarn"
include: yarn.yml
include_tasks: yarn.yml

- name: "Include tasks for Yarn packages"
include: packages.yml
include_tasks: packages.yml
3 changes: 1 addition & 2 deletions tasks/yarn.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
- name: "Yarn | Check for installation"
shell: which yarn
register: yarn_result
changed_when: '"yarn" not in yarn_result.stdout'
changed_when: false
failed_when: false

Expand All @@ -38,7 +37,7 @@
when: '"Usage" not in yarn_result.stdout and "Yarn requires Node" not in yarn_result.stdout and "is not supported, please use Node.js" not in yarn_result.stdout'

- name: "Yarn | Include OS-specific tasks"
include: "yarn-{{ ansible_os_family }}.yml"
include_tasks: "yarn-{{ ansible_os_family }}.yml"
when: 'yarn_install_state|bool == true'

- name: "Yarn | Install"
Expand Down

0 comments on commit 97a71b7

Please sign in to comment.