Skip to content

Commit

Permalink
Merge pull request #83 from fubarhouse/deprecated-stuff
Browse files Browse the repository at this point in the history
Deprecated stuff
  • Loading branch information
fubarhouse authored May 1, 2018
2 parents 128b89f + 9cb769b commit d566ce7
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 19 deletions.
12 changes: 8 additions & 4 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: test.yml
# - distro: yakkety
# init: /sbin/init
# run_opts: --privileged
# playbook: test.yml
- distro: yakkety
init: /sbin/init
run_opts: --privileged
playbook: test.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: test.yml
- distro: fedora-28
init: /usr/lib/systemd/systemd
run_opts: --privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro
playbook: test.yml

before_install:

Expand Down
3 changes: 2 additions & 1 deletion meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ galaxy_info:
- 25
- 26
- 27
- 28
- name: Ubuntu
versions:
- precise
Expand All @@ -31,7 +32,7 @@ galaxy_info:
- wily
- vivid
- xenial
# - yakkety
- yakkety
- zesty
- artful
- bionic
Expand Down
6 changes: 3 additions & 3 deletions tasks/install.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---

- name: "Go-Lang | Include bootstrap tasks"
include: install-bootstrap.yml
include_tasks: install-bootstrap.yml
when:
(install_go_bootstrap|bool == true) and
((go_binary_bootstrap.stat.exists|bool == false) or
Expand All @@ -10,14 +10,14 @@
(GOROOT_BOOTSTRAP is defined)

- name: "Go-Lang | Include source build tasks"
include: install-git.yml
include_tasks: install-git.yml
when:
(build_go_from_source|bool == true) and
((expected_go_version_output|string not in current_go_version.stdout|default('')) or
(go_install_clean|bool == true))

- name: "Go-Lang | Include distro install tasks"
include: install-distro.yml
include_tasks: install-distro.yml
when:
(build_go_from_source|bool == false) and
((expected_go_version_output|string not in current_go_version.stdout|default('')) or
Expand Down
12 changes: 6 additions & 6 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,29 @@
# main tasks file for fubarhouse-golang

- name: "Include tasks gathering system information"
include: setup.yml
include_tasks: setup.yml

- name: "Include tasks to clean installation"
include: cleanup.yml
include_tasks: cleanup.yml
when: go_install_clean|bool == true

- name: "Include tasks for installation"
include: install.yml
include_tasks: install.yml
when: ((current_go_version is not defined) or
(expected_go_version_output|string not in current_go_version.stdout|default('')) or
(go_install_clean|bool == true)) and
(go_uninstall|bool == false)

- name: "Include tasks for Go Get"
include: go-get.yml
include_tasks: go-get.yml
when: (go_get.0 is defined) and
(go_uninstall|bool == false)

- name: "Include tasks for Go Install"
include: go-install.yml
include_tasks: go-install.yml
when: (go_install.0 is defined) and
(go_uninstall|bool == false)

- name: "Include tasks for setting Go permissions"
include: perm.yml
include_tasks: perm.yml
when: go_uninstall|bool == false
10 changes: 5 additions & 5 deletions tasks/setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,23 @@
when: fubarhouse_user_dir is not defined

- name: "Go-Lang | Include OS-Specific tasks (CentOS)"
include: tasks-CentOS.yml
include_tasks: tasks-CentOS.yml
when: ansible_distribution == "CentOS"

- name: "Go-Lang | Include OS-Specific tasks (Darwin)"
include: tasks-Darwin.yml
include_tasks: tasks-Darwin.yml
when: ansible_os_family == 'Darwin'

- name: "Go-Lang | Include OS-Specific tasks (Debian)"
include: tasks-Debian.yml
include_tasks: tasks-Debian.yml
when: ansible_os_family == "Debian"

- name: "Go-Lang | Include OS-Specific tasks (FreeBSD)"
include: tasks-Debian.yml
include_tasks: tasks-Debian.yml
when: ansible_distribution == 'FreeBSD'

- name: "Go-Lang | Include OS-Specific tasks (RedHat)"
include: tasks-RedHat.yml
include_tasks: tasks-RedHat.yml
when:
- ansible_os_family == "RedHat"
- ansible_distribution != "CentOS"
Expand Down

0 comments on commit d566ce7

Please sign in to comment.