go
/
build
зеркало из https://github.com/golang/build.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

maintner/maintnerd/maintapi: test x/tools gopls release branches with past Go 

Fixes golang/go#46156.

Change-Id: I1f8788afb49b8c42d4ad1b0d1782b5e087832ba5
Reviewed-on: https://go-review.googlesource.com/c/build/+/319792
Trust: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Rebecca Stambler <rstambler@golang.org>
Reviewed-by: Robert Findley <rfindley@google.com>
This commit is contained in:
Dmitri Shuralyov 2021-05-13 11:52:08 -04:00
Родитель cd918eb5f9
Коммит 48b0b7a5be
2 изменённых файлов: 12 добавлений и 5 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
maintner/maintnerd/maintapi/api.go
Просмотреть файл

@ -192,9 +192,11 @@ func tryWorkItem(
w.GoCommit = []string{goCommit.String()}
w.GoBranch = []string{goBranch}
w.GoVersion = []*apipb.MajorMinor{{major, minor}}
} else if w.Branch == "master" {
// For subrepos on the "master" branch, use the default policy
// of testing it with Go tip and the supported releases.
} else if w.Branch == "master" ||
w.Project == "tools" && strings.HasPrefix(w.Branch, "gopls-release-branch.") { // Issue 46156.
// For subrepos on the "master" branch and select branches that have opted in,
// use the default policy of testing it with Go tip and the supported releases.
w.GoCommit = []string{goProj.Ref("refs/heads/master").String()}
w.GoBranch = []string{"master"}
w.GoVersion = []*apipb.MajorMinor{&develVersion}

9
maintner/maintnerd/maintapi/api_test.go
Просмотреть файл

@ -180,11 +180,16 @@ func TestTryWorkItem(t *testing.T) {
// Test that TryBots run on branches of the x/ repositories, other than
// "master" and "release-branch.go1.N". See issue 37512.
{"tools", 227356, &gerrit.ChangeInfo{}, nil, `project:"tools" branch:"gopls-release-branch.0.4" change_id:"Ica799fcf117bf607c0c59f41b08a78552339dc53" commit:"13af72af5ccdfe6f1e75b57b02cfde3bb0a77a76" ` +
`go_commit:"9995c6b50aa55c1cc1236d1d688929df512dad53" go_branch:"master" go_version:<major:1 minor:17 > `},
{"tools", 238259, &gerrit.ChangeInfo{}, nil, `project:"tools" branch:"dev.go2go" change_id:"I24950593b517af011a636966cb98b9652d2c4134" commit:"76e917206452e73dc28cbeb58a15ea8f30487263" ` +
`go_commit:"9995c6b50aa55c1cc1236d1d688929df512dad53" go_branch:"master" go_version:<major:1 minor:17 > `},
// Test that x/tools TryBots on gopls release branches are
// tested on tip and two supported releases. See issue 46156.
{"tools", 316773, &gerrit.ChangeInfo{}, nil, `project:"tools" branch:"gopls-release-branch.0.6" change_id:"I32fd2c0d30854e61109ebd16a05d5099f9074fe5" commit:"0bb7e5c47b1a31f85d4f173edc878a8e049764a5" ` +
`go_commit:"9995c6b50aa55c1cc1236d1d688929df512dad53" go_commit:"e67a58b7cb2b228e04477dfdb1aacd8348e63534" go_commit:"72ccabc99449b2cb5bb1438eb90244d55f7b02f5" ` +
`go_branch:"master" go_branch:"release-branch.go1.16" go_branch:"release-branch.go1.15" ` +
`go_version:<major:1 minor:17 > go_version:<major:1 minor:16 > go_version:<major:1 minor:15 > `},
// With comments:
{
proj: "go",