build: fix Go 1.19.0 bootstrapper issues on 386 PPA

shekhirin · Jun 6, 2023 · c6a89d6 · c6a89d6
1 parent 0e58e39
commit c6a89d6
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/build/checksums.txt b/build/checksums.txt
@@ -43,4 +43,4 @@ bce02f7232723cb727755ee11f168a700a00896a25d37f87c4b173bce55596b4  golangci-lint-
 cf6403f84707ce8c98664736772271bc8874f2e760c2fd0f00cf3e85963507e9  golangci-lint-1.51.1-windows-armv7.zip
 
 # This is the builder on PPA that will build Go itself (inception-y), don't modify!
-9419cc70dc5a2523f29a77053cafff658ed21ef3561d9b6b020280ebceab28b9  go1.19.src.tar.gz
+d7f0013f82e6d7f862cc6cb5c8cdb48eef5f2e239b35baa97e2f1a7466043767  go1.19.6.src.tar.gz
diff --git a/build/ci.go b/build/ci.go
@@ -147,7 +147,7 @@ var (
 	// to build the latest Go. Don't change it. If it ever becomes infufficient,
 	// we need to switch over to a recursive builder to jumpt across supported
 	// versions.
-	gobootVersion = "1.19"
+	gobootVersion = "1.19.6"
 )
 
 var GOBIN, _ = filepath.Abs(filepath.Join("build", "bin"))

diff --git a/internal/build/util.go b/internal/build/util.go
@@ -176,7 +176,6 @@ func UploadSFTP(identityFile, host, dir string, files []string) error {
 				time.Sleep(500 * time.Millisecond)
 				aborted = true
 				sftp.Process.Kill()
-				return
 			}
 		}
 	}()