Merge pull request #24813 from holiman/jammy

build: ppa build for jammy (ubuntu 22.04)
3 years ago · 0a9e384cd5
parent b3af0a5538 c164aed1d1
commit 0a9e384cd5
1 changed files with 7 additions and 6 deletions
--- a/build/ci.go
+++ b/build/ci.go
@ -133,12 +133,13 @@ var (
 	// Note: the following Ubuntu releases have been officially deprecated on Launchpad:
 	//   wily, yakkety, zesty, artful, cosmic, disco, eoan, groovy, hirsuite
 	debDistroGoBoots = map[string]string{
-		"trusty": "golang-1.11", // EOL: 04/2024
-		"xenial": "golang-go",   // EOL: 04/2026
-		"bionic": "golang-go",   // EOL: 04/2028
-		"focal":  "golang-go",   // EOL: 04/2030
-		"impish": "golang-go",   // EOL: 07/2022
-		// "jammy": "golang-go",   // EOL: 04/2027
+		"trusty":  "golang-1.11", // EOL: 04/2024
+		"xenial":  "golang-go",   // EOL: 04/2026
+		"bionic":  "golang-go",   // EOL: 04/2028
+		"focal":   "golang-go",   // EOL: 04/2030
+		"impish":  "golang-go",   // EOL: 07/2022
+		"jammy":   "golang-go",   // EOL: 04/2032
+		//"kinetic": "golang-go",   //  EOL: 07/2023
 	}

 	debGoBootPaths = map[string]string{