Merge pull request #132 from fubarhouse/issue/131

Issue 131
fubarhouse · Aug 21, 2019 · 5ac7be8 · 5ac7be8
2 parents cfb6298 + 1d419cb
commit 5ac7be8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -16,9 +16,5 @@ install_go_bootstrap: false
 go_build_script: make.bash
 
 # Go get
-go_get:
-- name: dep
-  url: github.com/golang/dep/cmd/dep
-- name: vgo
-  url: golang.org/x/vgo
+go_get: []
 go_install: []
diff --git a/tasks/setup.yml b/tasks/setup.yml
@@ -21,9 +21,9 @@
     fubarhouse_user_dir: "{{ shell_home_dir.stdout }}"
   when: fubarhouse_user_dir is not defined
 
-- name: "Go-Lang | Include OS-Specific tasks (CentOS)"
+- name: "Go-Lang | Include OS-Specific tasks (CentOS and Amazon)"
   include_tasks: tasks-CentOS.yml
-  when: ansible_distribution == "CentOS"
+  when: ansible_distribution == "CentOS" or ansible_distribution == "Amazon"
 
 - name: "Go-Lang | Include OS-Specific tasks (Darwin)"
   include_tasks: tasks-Darwin.yml
@@ -42,6 +42,7 @@
   when:
     - ansible_os_family == "RedHat"
     - ansible_distribution != "CentOS"
+    - ansible_distribution != "Amazon"
 
 - name: "Go-Lang | Define GO111MODULE"
   set_fact:

diff --git a/tests/test.yml b/tests/test.yml
@@ -11,6 +11,9 @@
     GOPATH: /home/travis/gopath
     GOROOT_BOOTSTRAP: /home/travis/goroot1.4
     GO111MODULE: "off"
+    go_get:
+      - name: dep
+        url: github.com/golang/dep/cmd/dep
 
   pre_tasks:
     - name: Check temporary directory permissions.