From 753adef7277dc7d47509a15a246028cac134a694 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera Date: Sat, 21 Dec 2024 20:01:48 +0800 Subject: [PATCH 1/2] go: remove misleading comment in `go.env` See #202030 and golang/go#70949. In particular, our current `go.env` contains # Automatically download newer toolchains as directed by go.mod files. # See https://go.dev/doc/toolchain for details. GOTOOLCHAIN=local The comment about automatically downloading newer toolchains applies only whenever `GOTOOLCHAIN=auto`, but we change that to `GOTOOLCHAIN=local`. Therefore, let's get rid of the comment that no longer applies after our `GOTOOLCHAIN` change. --- Formula/g/go.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Formula/g/go.rb b/Formula/g/go.rb index 90e70b1b71d3..a8f3fb0aa1ba 100644 --- a/Formula/g/go.rb +++ b/Formula/g/go.rb @@ -63,7 +63,11 @@ class Go < Formula end def install - inreplace "go.env", /^GOTOOLCHAIN=.*$/, "GOTOOLCHAIN=local" + inreplace "go.env" do |s| + # Remove misleading comment about automatically downloading newer toolchains. + s.gsub!(/^# Automatically download.*$/, "") + s.gsub!(/^GOTOOLCHAIN=.*$/, "GOTOOLCHAIN=local") + end (buildpath/"gobootstrap").install resource("gobootstrap") ENV["GOROOT_BOOTSTRAP"] = buildpath/"gobootstrap" From 224180ecb816ec80fff5fcada9ad323bddd9e111 Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Sat, 21 Dec 2024 13:38:45 +0000 Subject: [PATCH 2/2] go: update 1.23.4 bottle. --- Formula/g/go.rb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Formula/g/go.rb b/Formula/g/go.rb index a8f3fb0aa1ba..10bc83439b27 100644 --- a/Formula/g/go.rb +++ b/Formula/g/go.rb @@ -21,12 +21,13 @@ class Go < Formula end bottle do - sha256 arm64_sequoia: "5a84bce32e529be0472734e5789883471df559105afa2a92498631c75032d86c" - sha256 arm64_sonoma: "5a84bce32e529be0472734e5789883471df559105afa2a92498631c75032d86c" - sha256 arm64_ventura: "5a84bce32e529be0472734e5789883471df559105afa2a92498631c75032d86c" - sha256 sonoma: "7edf89af80b910df2599cb12402f356276ff266f2c2c56072214706ddbade724" - sha256 ventura: "7edf89af80b910df2599cb12402f356276ff266f2c2c56072214706ddbade724" - sha256 x86_64_linux: "90eb5bd4696656becce3fcffb7ab69a1d4333d41ac6f458a64c5dd1651922857" + rebuild 1 + sha256 arm64_sequoia: "ce9aad234b15d873fcd727306ab7a361db924b449f527904b3614c3aa4773767" + sha256 arm64_sonoma: "ce9aad234b15d873fcd727306ab7a361db924b449f527904b3614c3aa4773767" + sha256 arm64_ventura: "ce9aad234b15d873fcd727306ab7a361db924b449f527904b3614c3aa4773767" + sha256 sonoma: "333dc0e36f21c81f8b07f8b0d9125a6cc0b16979de9d996979bf1eff6280b9bf" + sha256 ventura: "333dc0e36f21c81f8b07f8b0d9125a6cc0b16979de9d996979bf1eff6280b9bf" + sha256 x86_64_linux: "b18da6cb774e738cb65bd9840521a85c1eda42323e3264730794624a81dcfa64" end # Don't update this unless this version cannot bootstrap the new version.