Merge pull request #21461 from karalabe/ppa-drop-disco

build: drop disco, enable groovy on Ubuntu PPAs
4 years ago · 560d44479c
parent 2ff464b29d 32b078d418
commit 560d44479c
1 changed files with 2 additions and 1 deletions
--- a/build/ci.go
+++ b/build/ci.go
@ -139,13 +139,14 @@ var (
 	// Note: zesty is unsupported because it was officially deprecated on Launchpad.
 	// Note: artful is unsupported because it was officially deprecated on Launchpad.
 	// Note: cosmic is unsupported because it was officially deprecated on Launchpad.
+	// Note: disco is unsupported because it was officially deprecated on Launchpad.
 	debDistroGoBoots = map[string]string{
 		"trusty": "golang-1.11",
 		"xenial": "golang-go",
 		"bionic": "golang-go",
-		"disco":  "golang-go",
 		"eoan":   "golang-go",
 		"focal":  "golang-go",
+		"groovy": "golang-go",
 	}

 	debGoBootPaths = map[string]string{