From 4b0181add8b5faba00527c62a7aa01dc146e61e3 Mon Sep 17 00:00:00 2001
From: Son Luong Ngoc <sluongng@gmail.com>
Date: Thu, 17 Aug 2023 11:54:00 +0200
Subject: [PATCH] use glob instead

---
 go/private/BUILD.sdk.bazel | 2 +-
 go/private/sdk.bzl         | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/go/private/BUILD.sdk.bazel b/go/private/BUILD.sdk.bazel
index 35c5ca1ee9..ecc2a4c7fc 100644
--- a/go/private/BUILD.sdk.bazel
+++ b/go/private/BUILD.sdk.bazel
@@ -80,7 +80,7 @@ filegroup(
         "bin/go*",
         "src/**",
         "pkg/**",
-        {goenv}
+        "go.env*",
     ]),
 )
 
diff --git a/go/private/sdk.bzl b/go/private/sdk.bzl
index c96730521d..08c6e74c00 100644
--- a/go/private/sdk.bzl
+++ b/go/private/sdk.bzl
@@ -478,9 +478,6 @@ def _sdk_build_file(ctx, platform, version, experiments):
         if not "nocoverageredesign" in experiments and not "coverageredesign" in experiments:
             experiments = experiments + ["nocoverageredesign"]
 
-    # TODO(sluongng): Remove this once we drop support for Go 1.20
-    include_go_env = pv[1] >= 21
-
     ctx.template(
         "BUILD.bazel",
         ctx.path(ctx.attr._sdk_build_file),
@@ -491,7 +488,6 @@ def _sdk_build_file(ctx, platform, version, experiments):
             "{exe}": ".exe" if goos == "windows" else "",
             "{version}": version,
             "{experiments}": repr(experiments),
-            "{goenv}": "\"go.env\"," if include_go_env else "",
         },
     )