From 7f02c178e66e8c150e0c8479e2bdcdd7e3b99084 Mon Sep 17 00:00:00 2001 From: Leo Pang <34628052+allthatjazzleo@users.noreply.github.com> Date: Wed, 18 Sep 2024 02:16:11 +0800 Subject: [PATCH 1/2] feat: add golang v1.23 (#279) --- builder/go_versions.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/builder/go_versions.go b/builder/go_versions.go index cafb352..6378e18 100644 --- a/builder/go_versions.go +++ b/builder/go_versions.go @@ -14,6 +14,7 @@ const ( Go120Version = "1.20.14" Go121Version = "1.21.7" Go122Version = "1.22.6" + Go123Version = "1.23.1" // ADD NEW GO VERSION [1] - latest patch release for each major/minor // When updating alpine image, ensure all golang build image combinations below exist @@ -29,6 +30,7 @@ var ( Go120Image = GolangAlpineImage(Go120Version, LatestAlpineImageVersion) Go121Image = GolangAlpineImage(Go121Version, LatestAlpineImageVersion) Go122Image = GolangAlpineImage(Go122Version, LatestAlpineImageVersion) + Go123Image = GolangAlpineImage(Go123Version, LatestAlpineImageVersion) // ADD NEW GO VERSION [3] - update GoDefaultVersion and GoDefaultImage to latest GoDefaultVersion = Go122Version @@ -51,6 +53,7 @@ var GoImageForVersion = map[string]GoVersion{ "1.20": GoVersion{Version: Go120Version, Image: Go120Image}, "1.21": GoVersion{Version: Go121Version, Image: Go121Image}, "1.22": GoVersion{Version: Go122Version, Image: Go122Image}, + "1.23": GoVersion{Version: Go122Version, Image: Go123Image}, // ADD NEW GO VERSION [4] } From 64301f43bf1177f096712150c619027d0c4653f8 Mon Sep 17 00:00:00 2001 From: Andrew Gouin Date: Tue, 17 Sep 2024 13:18:47 -0600 Subject: [PATCH 2/2] fix(neutron): Package libwasmvm (#280) * Switch neutron back to cosmos dockerfile * Copy lib for cargo --- builder/go_versions.go | 12 ++++++------ chains.yaml | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/builder/go_versions.go b/builder/go_versions.go index 6378e18..691b6b6 100644 --- a/builder/go_versions.go +++ b/builder/go_versions.go @@ -12,13 +12,13 @@ const ( Go118Version = "1.18.10" Go119Version = "1.19.13" Go120Version = "1.20.14" - Go121Version = "1.21.7" - Go122Version = "1.22.6" + Go121Version = "1.21.13" + Go122Version = "1.22.7" Go123Version = "1.23.1" // ADD NEW GO VERSION [1] - latest patch release for each major/minor // When updating alpine image, ensure all golang build image combinations below exist - LatestAlpineImageVersion = "3.19" + LatestAlpineImageVersion = "3.20" ) var ( @@ -27,14 +27,14 @@ var ( // Find from https://hub.docker.com/_/golang Go118Image = GolangAlpineImage(Go118Version, "3.17") // Go 1.18 is now deprecated, pinning to 3.17 Go119Image = GolangAlpineImage(Go119Version, "3.18") // Go 1.19 is now deprecated, pinning to 3.18 - Go120Image = GolangAlpineImage(Go120Version, LatestAlpineImageVersion) + Go120Image = GolangAlpineImage(Go120Version, "3.19") Go121Image = GolangAlpineImage(Go121Version, LatestAlpineImageVersion) Go122Image = GolangAlpineImage(Go122Version, LatestAlpineImageVersion) Go123Image = GolangAlpineImage(Go123Version, LatestAlpineImageVersion) // ADD NEW GO VERSION [3] - update GoDefaultVersion and GoDefaultImage to latest - GoDefaultVersion = Go122Version - GoDefaultImage = Go122Image // default image for cosmos go builds if go.mod parse fails + GoDefaultVersion = Go123Version + GoDefaultImage = Go123Image // default image for cosmos go builds if go.mod parse fails ) func GolangAlpineImage(goVersion, alpineVersion string) string { diff --git a/chains.yaml b/chains.yaml index 5b23a41..019aca8 100644 --- a/chains.yaml +++ b/chains.yaml @@ -864,6 +864,8 @@ build-target: make install binaries: - /root/go/bin/neutrond + libraries: + - /root/go/pkg/mod/github.com/!cosm!wasm/wasmvm/*/internal/api/libwasmvm.${ARCH}.so # Nibiru - name: nibiru