From 6b7e75c15674ec89fd06a1e0695f5d71821cb848 Mon Sep 17 00:00:00 2001 From: Andrew Gouin Date: Tue, 17 Sep 2024 12:25:53 -0600 Subject: [PATCH 1/2] Switch neutron back to cosmos dockerfile --- chains.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/chains.yaml b/chains.yaml index 5b23a411..451bf6e1 100644 --- a/chains.yaml +++ b/chains.yaml @@ -860,10 +860,12 @@ - name: neutron github-organization: neutron-org github-repo: neutron - dockerfile: cargo + dockerfile: cosmos build-target: make install + build-env: + - BUILD_TAGS=muslc binaries: - - /root/go/bin/neutrond + - /go/bin/neutrond # Nibiru - name: nibiru From 549d83603265cb3a405b7b38587967f1df7c28ea Mon Sep 17 00:00:00 2001 From: Andrew Gouin Date: Tue, 17 Sep 2024 13:01:17 -0600 Subject: [PATCH 2/2] Copy lib for cargo --- builder/go_versions.go | 12 ++++++------ chains.yaml | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/builder/go_versions.go b/builder/go_versions.go index 6378e181..691b6b6d 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 451bf6e1..019aca8f 100644 --- a/chains.yaml +++ b/chains.yaml @@ -860,12 +860,12 @@ - name: neutron github-organization: neutron-org github-repo: neutron - dockerfile: cosmos + dockerfile: cargo build-target: make install - build-env: - - BUILD_TAGS=muslc binaries: - - /go/bin/neutrond + - /root/go/bin/neutrond + libraries: + - /root/go/pkg/mod/github.com/!cosm!wasm/wasmvm/*/internal/api/libwasmvm.${ARCH}.so # Nibiru - name: nibiru