diff options
author | Russ Cox <rsc@golang.org> | 2017-02-27 10:11:04 -0500 |
---|---|---|
committer | Russ Cox <rsc@golang.org> | 2017-02-27 15:41:51 +0000 |
commit | 0954fdd51e390e209317d4652d7effc15512fd50 (patch) | |
tree | 2270a3e92b1e9d2a72c51e204a2624e3afcac910 | |
parent | 3b4fc5d1c67f363322fb141a3a1444b83cccea3a (diff) | |
download | go-0954fdd51e390e209317d4652d7effc15512fd50.tar.gz go-0954fdd51e390e209317d4652d7effc15512fd50.zip |
[dev.typealias] set version to go1.8.typealias, including new build tag
This will keep toolchains built on this branch from pretending
to support whatever new things are coming in Go 1.9.
Change-Id: I3e0b623be57c3ad7e01f32abf148d181e3dc1fec
Reviewed-on: https://go-review.googlesource.com/37510
Run-TryBot: Russ Cox <rsc@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
-rw-r--r-- | VERSION | 1 | ||||
-rw-r--r-- | src/cmd/dist/test.go | 1 | ||||
-rw-r--r-- | src/go/build/build.go | 2 | ||||
-rw-r--r-- | src/go/build/doc.go | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/VERSION b/VERSION new file mode 100644 index 0000000000..5f9fe66b7b --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +go1.8.typealias
\ No newline at end of file diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go index c51dcead2b..f97f81ecc3 100644 --- a/src/cmd/dist/test.go +++ b/src/cmd/dist/test.go @@ -600,6 +600,7 @@ func (t *tester) registerTests() { }) } } + return // skip API check on go1.8.typealias branch if t.goos != "nacl" && t.goos != "android" && !t.iOS() { t.tests = append(t.tests, distTest{ name: "api", diff --git a/src/go/build/build.go b/src/go/build/build.go index 31456ea343..109635486e 100644 --- a/src/go/build/build.go +++ b/src/go/build/build.go @@ -291,7 +291,7 @@ func defaultContext() Context { // say "+build go1.x", and code that should only be built before Go 1.x // (perhaps it is the stub to use in that case) should say "+build !go1.x". // NOTE: If you add to this list, also update the doc comment in doc.go. - c.ReleaseTags = []string{"go1.1", "go1.2", "go1.3", "go1.4", "go1.5", "go1.6", "go1.7", "go1.8", "go1.9"} + c.ReleaseTags = []string{"go1.1", "go1.2", "go1.3", "go1.4", "go1.5", "go1.6", "go1.7", "go1.8", "go1.8.typealias"} env := os.Getenv("CGO_ENABLED") if env == "" { diff --git a/src/go/build/doc.go b/src/go/build/doc.go index 422e1a5ffd..5bdba4430f 100644 --- a/src/go/build/doc.go +++ b/src/go/build/doc.go @@ -105,7 +105,7 @@ // - "go1.6", from Go version 1.6 onward // - "go1.7", from Go version 1.7 onward // - "go1.8", from Go version 1.8 onward -// - "go1.9", from Go version 1.9 onward +// - "go1.8.typealias", for Go version 1.8 with aliases // - any additional words listed in ctxt.BuildTags // // If a file's name, after stripping the extension and a possible _test suffix, |