cmd/releasebot, cmd/release: add windows-arm64 target for Go 1.17

Support for Windows on ARM is only available in the newer WiX v3.14
development release, so start using that for windows/arm64 release.

Remove the unused ProdId variable in installer.wxs.

For the windows/arm64 installer, increase InstallerVersion property
to 500, since 300 is below the minimum for the arm64 platform per
https://wixtoolset.org/documentation/manual/v3/xsd/wix/package.html.

Remove the test that a godoc shortcut isn't included. This test was
useful back when that shortcut was conditionally included depending
on the Go version, but no supported release includes godoc by now.

Fixes golang/go#46355.

Change-Id: I9273e764d73d0a941f6300d2b761653eb09b977e
Reviewed-on: https://go-review.googlesource.com/c/build/+/324069
Trust: Dmitri Shuralyov <[email protected]>
Run-TryBot: Dmitri Shuralyov <[email protected]>
TryBot-Result: Go Bot <[email protected]>
Reviewed-by: Heschi Kreinick <[email protected]>
Reviewed-by: Carlos Amedee <[email protected]>

Author: dmitshur

cmd/release/release.go

@@ -201,6 +201,17 @@ var builds = []*Build{
 		Race:    true,
 		Builder: "windows-amd64-2008",
 	},
+	{
+		GoQuery: ">= go1.17beta1", // Go 1.17 Beta 1 is the first Go (pre-)release with the windows/arm64 port.
+		OS:      "windows",
+		Arch:    "arm64",
+		Race:    false, // Not supported as of 2021-06-01.
+		Builder: "windows-arm64-aws",
+
+		// TODO(golang.org/issue/46406, golang.org/issue/46502): Fix or skip failing tests,
+		// ensure the builder is fast enough to complete tests, then remove SkipTests here.
+		SkipTests: true,
+	},
 	{
 		GoQuery: ">= go1.17beta1",
 		OS:      "darwin",
@@ -598,6 +609,11 @@ func (b *Build) make() error {
 	if b.OS == "windows" {
 		cleanFiles = append(cleanFiles, "msi")
 	}
+	if b.OS == "windows" && b.Arch == "arm64" {
+		// At least on windows-arm64, 'wix/winterop.dll' gets created.
+		// Delete the entire wix directory since it's unrelated to Go.
+		cleanFiles = append(cleanFiles, "wix")
+	}
 
 	// Need to delete everything except the final "go" directory,
 	// as we make the tarball relative to workdir.

cmd/release/releaselet.go

@@ -90,8 +90,15 @@ func windowsMSI() error {
 	// Install Wix tools.
 	wix := filepath.Join(cwd, "wix")
 	defer os.RemoveAll(wix)
-	if err := installWix(wix); err != nil {
-		return err
+	switch runtime.GOARCH {
+	default:
+		if err := installWix(wixRelease311, wix); err != nil {
+			return err
+		}
+	case "arm64":
+		if err := installWix(wixRelease314, wix); err != nil {
+			return err
+		}
 	}
 
 	// Write out windows data that is used by the packaging process.
@@ -125,6 +132,8 @@ func windowsMSI() error {
 			return "x86"
 		case "amd64":
 			return "x64"
+		case "arm64":
+			return "arm64"
 		}
 	}
 
@@ -159,20 +168,33 @@ func windowsMSI() error {
 	)
 }
 
-const wixBinaries = "https://storage.googleapis.com/go-builder-data/wix311-binaries.zip"
-const wixSha256 = "da034c489bd1dd6d8e1623675bf5e899f32d74d6d8312f8dd125a084543193de"
+type wixRelease struct {
+	BinaryURL string
+	SHA256    string
+}
+
+var (
+	wixRelease311 = wixRelease{
+		BinaryURL: "https://storage.googleapis.com/go-builder-data/wix311-binaries.zip",
+		SHA256:    "da034c489bd1dd6d8e1623675bf5e899f32d74d6d8312f8dd125a084543193de",
+	}
+	wixRelease314 = wixRelease{
+		BinaryURL: "https://storage.googleapis.com/go-builder-data/wix314-binaries.zip",
+		SHA256:    "34dcbba9952902bfb710161bd45ee2e721ffa878db99f738285a21c9b09c6edb", // WiX v3.14.0.4118 release, SHA 256 of wix314-binaries.zip from https://wixtoolset.org/releases/v3-14-0-4118/.
+	}
+)
 
 // installWix fetches and installs the wix toolkit to the specified path.
-func installWix(path string) error {
+func installWix(wix wixRelease, path string) error {
 	// Fetch wix binary zip file.
-	body, err := httpGet(wixBinaries)
+	body, err := httpGet(wix.BinaryURL)
 	if err != nil {
 		return err
 	}
 
-	// Verify sha256
+	// Verify sha256.
 	sum := sha256.Sum256(body)
-	if fmt.Sprintf("%x", sum) != wixSha256 {
+	if fmt.Sprintf("%x", sum) != wix.SHA256 {
 		return errors.New("sha256 mismatch for wix toolkit")
 	}
 
@@ -358,19 +380,24 @@ var windowsData = map[string]string{
 	"installer.wxs": `<?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 <!--
-# Copyright 2010 The Go Authors.  All rights reserved.
+# Copyright 2010 The Go Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 -->
 
 <?if $(var.Arch) = 386 ?>
-  <?define ProdId = {FF5B30B2-08C2-11E1-85A2-6ACA4824019B} ?>
   <?define UpgradeCode = {1C3114EA-08C3-11E1-9095-7FCA4824019B} ?>
+  <?define InstallerVersion="300" ?>
   <?define SysFolder=SystemFolder ?>
   <?define ArchProgramFilesFolder="ProgramFilesFolder" ?>
+<?elseif $(var.Arch) = arm64 ?>
+  <?define UpgradeCode = {21ade9a3-3fdd-4ba6-bea6-c85abadc9488} ?>
+  <?define InstallerVersion="500" ?>
+  <?define SysFolder=System64Folder ?>
+  <?define ArchProgramFilesFolder="ProgramFiles64Folder" ?>
 <?else?>
-  <?define ProdId = {716c3eaa-9302-48d2-8e5e-5cfec5da2fab} ?>
   <?define UpgradeCode = {22ea7650-4ac6-4001-bf29-f4b8775db1c0} ?>
+  <?define InstallerVersion="300" ?>
   <?define SysFolder=System64Folder ?>
   <?define ArchProgramFilesFolder="ProgramFiles64Folder" ?>
 <?endif?>
@@ -388,7 +415,7 @@ var windowsData = map[string]string{
     Keywords='Installer'
     Description="The Go Programming Language Installer"
     Comments="The Go programming language is an open source project to make programmers more productive."
-    InstallerVersion="300"
+    InstallerVersion="$(var.InstallerVersion)"
     Compressed="yes"
     InstallScope="perMachine"
     Languages="1033" />
@@ -627,11 +654,5 @@ func runSelfTests() {
 		}
 	}
 
-	// GoDoc binary is no longer bundled with the binary distribution
-	// as of Go 1.13, so there should not be a shortcut to it.
-	if strings.Contains(windowsData["installer.wxs"], "GODOC_SHORTCUT") {
-		log.Fatal("expected GODOC_SHORTCUT to be gone")
-	}
-
 	fmt.Println("ok")
 }