From 9b5df03c09cdcfdfb04534db40a0288f04492044 Mon Sep 17 00:00:00 2001
From: matt maier <maier@users.noreply.github.com>
Date: Tue, 1 Oct 2019 15:25:13 -0400
Subject: [PATCH] feat: support additional GOOS/GOARCH targets (#1162)

* feat: support illumos amd64 target

* feat: support other missing targets
---
 internal/builders/golang/targets.go      | 6 ++++++
 internal/builders/golang/targets_test.go | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/internal/builders/golang/targets.go b/internal/builders/golang/targets.go
index b13baa19ca0..703aef01b4a 100644
--- a/internal/builders/golang/targets.go
+++ b/internal/builders/golang/targets.go
@@ -93,7 +93,11 @@ func valid(target target) bool {
 // list from https://golang.org/doc/install/source#environment
 // nolint: gochecknoglobals
 var validTargets = []string{
+	"aixppc64",
+	"android386",
+	"androidamd64",
 	"androidarm",
+	"androidarm64",
 	"darwin386",
 	"darwinamd64",
 	// "darwinarm", - requires admin rights and other ios stuff
@@ -102,6 +106,7 @@ var validTargets = []string{
 	"freebsd386",
 	"freebsdamd64",
 	"freebsdarm",
+	"illumosamd64",
 	"jswasm",
 	"linux386",
 	"linuxamd64",
@@ -122,6 +127,7 @@ var validTargets = []string{
 	"openbsdarm",
 	"plan9386",
 	"plan9amd64",
+	"plan9arm",
 	"solarisamd64",
 	"windows386",
 	"windowsamd64",
diff --git a/internal/builders/golang/targets_test.go b/internal/builders/golang/targets_test.go
index 1bbe7c642e6..c38557df0a2 100644
--- a/internal/builders/golang/targets_test.go
+++ b/internal/builders/golang/targets_test.go
@@ -65,13 +65,18 @@ func TestGoosGoarchCombos(t *testing.T) {
 		valid bool
 	}{
 		// valid targets:
+		{"aix", "ppc64", true},
+		{"android", "386", true},
+		{"android", "amd64", true},
 		{"android", "arm", true},
+		{"android", "arm64", true},
 		{"darwin", "386", true},
 		{"darwin", "amd64", true},
 		{"dragonfly", "amd64", true},
 		{"freebsd", "386", true},
 		{"freebsd", "amd64", true},
 		{"freebsd", "arm", true},
+		{"illumos", "amd64", true},
 		{"linux", "386", true},
 		{"linux", "amd64", true},
 		{"linux", "arm", true},
@@ -91,6 +96,7 @@ func TestGoosGoarchCombos(t *testing.T) {
 		{"openbsd", "arm", true},
 		{"plan9", "386", true},
 		{"plan9", "amd64", true},
+		{"plan9", "arm", true},
 		{"solaris", "amd64", true},
 		{"windows", "386", true},
 		{"windows", "amd64", true},