internal/relui: build all distpacks on both Windows and Linux

Try to shake out any reproducibility bugs by building each distpack on two different host types. For golang/go#58659 Change-Id: Ibe858909bf8469b71ba5c25c1588286f459101e8 Reviewed-on: https://go-review.googlesource.com/c/build/+/502537 TryBot-Result: Gopher Robot <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]> Reviewed-by: Russ Cox <[email protected]> Auto-Submit: Heschi Kreinick <[email protected]> Run-TryBot: Heschi Kreinick <[email protected]>
golang · Jun 13, 2023 · 77ae890 · 77ae890
1 parent bf238fb
commit 77ae890
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/internal/relui/workflows.go b/internal/relui/workflows.go
@@ -451,7 +451,6 @@ func (tasks *BuildReleaseTasks) addBuildTasks(wd *wf.Definition, major int, vers
 	skipTests := wf.Param(wd, wf.ParamDef[[]string]{Name: "Targets to skip testing (or 'all') (optional)", ParamType: wf.SliceShort})
 
 	artifacts := []wf.Value[artifact]{source}
-	var reproducibilityCheckDistpack wf.Value[artifact]
 	var mods []wf.Value[moduleArtifact]
 	var blockers []wf.Dependency
 
@@ -466,9 +465,9 @@ func (tasks *BuildReleaseTasks) addBuildTasks(wd *wf.Definition, major int, vers
 		var mod wf.Value[moduleArtifact]
 		if enableDistpack(major) {
 			distpack := wf.Task3(wd, "Build distpack", tasks.buildDistpack, wf.Const("linux-amd64"), wf.Const(target), source)
-			if target.Name == "linux-amd64" {
-				reproducibilityCheckDistpack = distpack
-			}
+			reproducer := wf.Task3(wd, "Reproduce distpack on Windows", tasks.buildDistpack, wf.Const("windows-amd64-2016"), wf.Const(target), source)
+			match := wf.Action2(wd, "Check distpacks match", tasks.checkDistpacksMatch, distpack, reproducer)
+			blockers = append(blockers, match)
 			if target.GOOS == "windows" {
 				zip = wf.Task1(wd, "Get binary from distpack", tasks.binaryArchiveFromDistpack, distpack)
 				tar = wf.Task1(wd, "Convert to .tgz", tasks.convertZipToTGZ, zip)
@@ -512,10 +511,6 @@ func (tasks *BuildReleaseTasks) addBuildTasks(wd *wf.Definition, major int, vers
 			blockers = append(blockers, long)
 		}
 	}
-	if enableDistpack(major) {
-		reproducer := wf.Task3(wd, "Reproduce distpack on Windows", tasks.buildDistpack, wf.Const("windows-amd64-2016"), wf.Const(targets["linux-amd64"]), source)
-		blockers = append(blockers, wf.Action2(wd, "Check distpacks match", tasks.checkDistpacksMatch, reproducibilityCheckDistpack, reproducer))
-	}
 	signedArtifacts := wf.Task1(wd, "Compute GPG signature for artifacts", tasks.computeGPG, wf.Slice(artifacts...))
 
 	// Run advisory trybots.