Skip to content

Commit 863424b

Browse files
author
Bryan C. Mills
committed
internal/goversion: update to 1.15
This is a second attempt at CL 230024, with cmd/go/testdata/script/mod_retention.txt updated to perform a version-independent comparison on the 'go' version added to a go.mod file that lacks one. Fixes #38708 Change-Id: I15dcd83b51ed5ec57946b419bcbaec41e85a46f9 Reviewed-on: https://go-review.googlesource.com/c/go/+/230382 Run-TryBot: Bryan C. Mills <[email protected]> TryBot-Result: Gobot Gobot <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]>
1 parent 7b0c518 commit 863424b

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

src/cmd/go/testdata/script/mod_retention.txt

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ cmp go.mod go.mod.tidy
6464
# However, that should not remove other redundant requirements.
6565
cp go.mod.nogo go.mod
6666
go list all
67-
cmp go.mod go.mod.redundant
67+
cmpenv go.mod go.mod.currentgo
6868

6969

7070
-- go.mod.tidy --
@@ -133,3 +133,13 @@ require (
133133
rsc.io/sampler v1.3.0 // indirect
134134
rsc.io/testonly v1.0.0 // indirect
135135
)
136+
-- go.mod.currentgo --
137+
module m
138+
139+
go $goversion
140+
141+
require (
142+
rsc.io/quote v1.5.2
143+
rsc.io/sampler v1.3.0 // indirect
144+
rsc.io/testonly v1.0.0 // indirect
145+
)

src/go/build/doc.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@
112112
// - "go1.12", from Go version 1.12 onward
113113
// - "go1.13", from Go version 1.13 onward
114114
// - "go1.14", from Go version 1.14 onward
115+
// - "go1.15", from Go version 1.15 onward
115116
// - any additional words listed in ctxt.BuildTags
116117
//
117118
// There are no build tags for beta or minor releases.

src/internal/goversion/goversion.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ package goversion
1010
//
1111
// When incrementing this, also add to the list at src/go/build/doc.go
1212
// (search for "onward").
13-
const Version = 14
13+
const Version = 15

0 commit comments

Comments
 (0)