@@ -117,23 +117,15 @@ var (
117117 debEthereum ,
118118 }
119119
120- // Distros for which packages are created.
121- // Note: vivid is unsupported because there is no golang-1.6 package for it.
122- // Note: the following Ubuntu releases have been officially deprecated on Launchpad:
123- // wily, yakkety, zesty, artful, cosmic, disco, eoan, groovy, hirsuite, impish,
124- // kinetic, lunar
125- debDistroGoBoots = map [string ]string {
126- "trusty" : "golang-1.11" , // 14.04, EOL: 04/2024
127- "xenial" : "golang-go" , // 16.04, EOL: 04/2026
128- "bionic" : "golang-go" , // 18.04, EOL: 04/2028
129- "focal" : "golang-go" , // 20.04, EOL: 04/2030
130- "jammy" : "golang-go" , // 22.04, EOL: 04/2032
131- "mantic" : "golang-go" , // 23.10, EOL: 07/2024
132- }
120+ // Distros for which packages are created
121+ debDistros = []string {
122+ "xenial" , // 16.04, EOL: 04/2026
123+ "bionic" , // 18.04, EOL: 04/2028
124+ "focal" , // 20.04, EOL: 04/2030
125+ "jammy" , // 22.04, EOL: 04/2032
126+ "noble" , // 24.04, EOL: 04/2034
133127
134- debGoBootPaths = map [string ]string {
135- "golang-1.11" : "/usr/lib/go-1.11" ,
136- "golang-go" : "/usr/lib/go" ,
128+ "mantic" , // 23.10, EOL: 07/2024
137129 }
138130
139131 // This is where the tests should be unpacked.
@@ -708,9 +700,9 @@ func doDebianSource(cmdline []string) {
708700
709701 // Create Debian packages and upload them.
710702 for _ , pkg := range debPackages {
711- for distro , goboot := range debDistroGoBoots {
703+ for _ , distro := range debDistros {
712704 // Prepare the debian package with the go-ethereum sources.
713- meta := newDebMetadata (distro , goboot , * signer , env , now , pkg .Name , pkg .Version , pkg .Executables )
705+ meta := newDebMetadata (distro , * signer , env , now , pkg .Name , pkg .Version , pkg .Executables )
714706 pkgdir := stageDebianSource (* workdir , meta )
715707
716708 // Add bootstrapper Go source code
@@ -853,10 +845,7 @@ type debPackage struct {
853845}
854846
855847type debMetadata struct {
856- Env build.Environment
857- GoBootPackage string
858- GoBootPath string
859-
848+ Env build.Environment
860849 PackageName string
861850
862851 // go-ethereum version being built. Note that this
@@ -884,21 +873,19 @@ func (d debExecutable) Package() string {
884873 return d .BinaryName
885874}
886875
887- func newDebMetadata (distro , goboot , author string , env build.Environment , t time.Time , name string , version string , exes []debExecutable ) debMetadata {
876+ func newDebMetadata (distro , author string , env build.Environment , t time.Time , name string , version string , exes []debExecutable ) debMetadata {
888877 if author == "" {
889878 // No signing key, use default author.
890879 author = "Ethereum Builds <[email protected] >" 891880 }
892881 return debMetadata {
893- GoBootPackage : goboot ,
894- GoBootPath : debGoBootPaths [goboot ],
895- PackageName : name ,
896- Env : env ,
897- Author : author ,
898- Distro : distro ,
899- Version : version ,
900- Time : t .Format (time .RFC1123Z ),
901- Executables : exes ,
882+ PackageName : name ,
883+ Env : env ,
884+ Author : author ,
885+ Distro : distro ,
886+ Version : version ,
887+ Time : t .Format (time .RFC1123Z ),
888+ Executables : exes ,
902889 }
903890}
904891
0 commit comments