Skip to content

Commit babbbed

Browse files
committedFeb 15, 2024
gopls/release: remove obsolete validateHardCodedVersion
We no longer hard-code the gopls version. Change-Id: I6f91f6e8f97732803aa5dfe05203ceee0611c489 Reviewed-on: https://go-review.googlesource.com/c/tools/+/562677 LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Hyang-Ah Hana Kim <hyangah@gmail.com>
1 parent ea9e542 commit babbbed

File tree

1 file changed

+0
-48
lines changed

1 file changed

+0
-48
lines changed
 

Diff for: ‎gopls/release/release.go

-48
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,14 @@ package main
1414
import (
1515
"flag"
1616
"fmt"
17-
"go/types"
1817
"log"
1918
"os"
2019
"os/exec"
2120
"path/filepath"
22-
"strconv"
2321
"strings"
2422

2523
"golang.org/x/mod/modfile"
2624
"golang.org/x/mod/semver"
27-
"golang.org/x/tools/go/packages"
2825
)
2926

3027
var versionFlag = flag.String("version", "", "version to tag")
@@ -52,10 +49,6 @@ func main() {
5249
if filepath.Base(wd) != "gopls" {
5350
log.Fatalf("must run from the gopls module")
5451
}
55-
// Confirm that they have updated the hardcoded version.
56-
if err := validateHardcodedVersion(*versionFlag); err != nil {
57-
log.Fatal(err)
58-
}
5952
// Confirm that the versions in the go.mod file are correct.
6053
if err := validateGoModFile(wd); err != nil {
6154
log.Fatal(err)
@@ -64,47 +57,6 @@ func main() {
6457
os.Exit(0)
6558
}
6659

67-
// validateHardcodedVersion reports whether the version hardcoded in the gopls
68-
// binary is equivalent to the version being published. It reports an error if
69-
// not.
70-
func validateHardcodedVersion(version string) error {
71-
const debugPkg = "golang.org/x/tools/gopls/internal/debug"
72-
pkgs, err := packages.Load(&packages.Config{
73-
Mode: packages.NeedName | packages.NeedFiles |
74-
packages.NeedCompiledGoFiles | packages.NeedImports |
75-
packages.NeedTypes | packages.NeedTypesSizes,
76-
}, debugPkg)
77-
if err != nil {
78-
return err
79-
}
80-
if len(pkgs) != 1 {
81-
return fmt.Errorf("expected 1 package, got %v", len(pkgs))
82-
}
83-
pkg := pkgs[0]
84-
if len(pkg.Errors) > 0 {
85-
return fmt.Errorf("failed to load %q: first error: %w", debugPkg, pkg.Errors[0])
86-
}
87-
obj := pkg.Types.Scope().Lookup("Version")
88-
c, ok := obj.(*types.Const)
89-
if !ok {
90-
return fmt.Errorf("no constant named Version")
91-
}
92-
hardcodedVersion, err := strconv.Unquote(c.Val().ExactString())
93-
if err != nil {
94-
return err
95-
}
96-
if semver.Prerelease(hardcodedVersion) != "" {
97-
return fmt.Errorf("unexpected pre-release for hardcoded version: %s", hardcodedVersion)
98-
}
99-
// Don't worry about pre-release tags and expect that there is no build
100-
// suffix.
101-
version = strings.TrimSuffix(version, semver.Prerelease(version))
102-
if hardcodedVersion != version {
103-
return fmt.Errorf("expected version to be %s, got %s", *versionFlag, hardcodedVersion)
104-
}
105-
return nil
106-
}
107-
10860
func validateGoModFile(goplsDir string) error {
10961
filename := filepath.Join(goplsDir, "go.mod")
11062
data, err := os.ReadFile(filename)

0 commit comments

Comments
 (0)