Skip to content

Commit 967883e

Browse files
committed
internal/dl: highlight Windows ARM64 installer
The windows/arm64 port is new to Go 1.17 and one of its key features. Highlight the Windows ARM64 installer, just like the Windows AMD64 installer is highlighted. (Keep the zip archives and 386 installer not highlighted.) For golang/go#36439. Change-Id: Ib57e80465d0ca090d165e14e3c4afdb2efca0c11 Reviewed-on: https://go-review.googlesource.com/c/website/+/344070 Trust: Dmitri Shuralyov <[email protected]> Run-TryBot: Dmitri Shuralyov <[email protected]> TryBot-Result: Go Bot <[email protected]> Reviewed-by: Carlos Amedee <[email protected]> Reviewed-by: Heschi Kreinick <[email protected]>
1 parent 9b2133e commit 967883e

File tree

2 files changed

+20
-17
lines changed

2 files changed

+20
-17
lines changed

internal/dl/dl.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ func (f File) Highlight() bool {
117117
return true
118118
case f.OS == "linux" && f.Arch == "amd64":
119119
return true
120-
case f.OS == "windows" && f.Kind == "installer" && f.Arch == "amd64":
120+
case f.OS == "windows" && f.Kind == "installer" && (f.Arch == "amd64" || f.Arch == "arm64"):
121121
return true
122122
case f.OS == "darwin" && f.Kind == "installer" && !strings.Contains(f.Filename, "osx10.6"):
123123
return true

internal/dl/dl_test.go

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -101,17 +101,19 @@ func TestFilesToReleases(t *testing.T) {
101101

102102
func TestHighlightedFiles(t *testing.T) {
103103
fs := []File{
104-
{Filename: "go1.16beta1.src.tar.gz", Version: "go1.16beta1", OS: "", Arch: "", Kind: "source"},
105-
{Filename: "go1.16beta1.linux-386.tar.gz", Version: "go1.16beta1", OS: "linux", Arch: "386", Kind: "archive"},
106-
{Filename: "go1.16beta1.linux-amd64.tar.gz", Version: "go1.16beta1", OS: "linux", Arch: "amd64", Kind: "archive"},
107-
{Filename: "go1.16beta1.darwin-amd64.tar.gz", Version: "go1.16beta1", OS: "darwin", Arch: "amd64", Kind: "archive"},
108-
{Filename: "go1.16beta1.darwin-amd64.pkg", Version: "go1.16beta1", OS: "darwin", Arch: "amd64", Kind: "installer"},
109-
{Filename: "go1.16beta1.darwin-arm64.tar.gz", Version: "go1.16beta1", OS: "darwin", Arch: "arm64", Kind: "archive"},
110-
{Filename: "go1.16beta1.darwin-arm64.pkg", Version: "go1.16beta1", OS: "darwin", Arch: "arm64", Kind: "installer"},
111-
{Filename: "go1.16beta1.windows-386.zip", Version: "go1.16beta1", OS: "windows", Arch: "386", Kind: "archive"},
112-
{Filename: "go1.16beta1.windows-386.msi", Version: "go1.16beta1", OS: "windows", Arch: "386", Kind: "installer"},
113-
{Filename: "go1.16beta1.windows-amd64.zip", Version: "go1.16beta1", OS: "windows", Arch: "amd64", Kind: "archive"},
114-
{Filename: "go1.16beta1.windows-amd64.msi", Version: "go1.16beta1", OS: "windows", Arch: "amd64", Kind: "installer"},
104+
{Filename: "go1.17.src.tar.gz", Version: "go1.17", OS: "", Arch: "", Kind: "source"},
105+
{Filename: "go1.17.linux-386.tar.gz", Version: "go1.17", OS: "linux", Arch: "386", Kind: "archive"},
106+
{Filename: "go1.17.linux-amd64.tar.gz", Version: "go1.17", OS: "linux", Arch: "amd64", Kind: "archive"},
107+
{Filename: "go1.17.darwin-amd64.tar.gz", Version: "go1.17", OS: "darwin", Arch: "amd64", Kind: "archive"},
108+
{Filename: "go1.17.darwin-amd64.pkg", Version: "go1.17", OS: "darwin", Arch: "amd64", Kind: "installer"},
109+
{Filename: "go1.17.darwin-arm64.tar.gz", Version: "go1.17", OS: "darwin", Arch: "arm64", Kind: "archive"},
110+
{Filename: "go1.17.darwin-arm64.pkg", Version: "go1.17", OS: "darwin", Arch: "arm64", Kind: "installer"},
111+
{Filename: "go1.17.windows-386.zip", Version: "go1.17", OS: "windows", Arch: "386", Kind: "archive"},
112+
{Filename: "go1.17.windows-386.msi", Version: "go1.17", OS: "windows", Arch: "386", Kind: "installer"},
113+
{Filename: "go1.17.windows-amd64.zip", Version: "go1.17", OS: "windows", Arch: "amd64", Kind: "archive"},
114+
{Filename: "go1.17.windows-amd64.msi", Version: "go1.17", OS: "windows", Arch: "amd64", Kind: "installer"},
115+
{Filename: "go1.17.windows-arm64.zip", Version: "go1.17", OS: "windows", Arch: "arm64", Kind: "archive"},
116+
{Filename: "go1.17.windows-arm64.msi", Version: "go1.17", OS: "windows", Arch: "arm64", Kind: "installer"},
115117
}
116118
sort.Sort(fileOrder(fs))
117119
var highlighted []string
@@ -123,11 +125,12 @@ func TestHighlightedFiles(t *testing.T) {
123125
}
124126
got := strings.Join(highlighted, "\n")
125127
want := strings.Join([]string{
126-
"go1.16beta1.src.tar.gz",
127-
"go1.16beta1.darwin-amd64.pkg",
128-
"go1.16beta1.darwin-arm64.pkg",
129-
"go1.16beta1.linux-amd64.tar.gz",
130-
"go1.16beta1.windows-amd64.msi",
128+
"go1.17.src.tar.gz",
129+
"go1.17.darwin-amd64.pkg",
130+
"go1.17.darwin-arm64.pkg",
131+
"go1.17.linux-amd64.tar.gz",
132+
"go1.17.windows-amd64.msi",
133+
"go1.17.windows-arm64.msi",
131134
}, "\n")
132135
if got != want {
133136
t.Errorf("highlighted files:\n%s\nwant:\n%s", got, want)

0 commit comments

Comments
 (0)