Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/go_modules/github.com/docker/dock…
Browse files Browse the repository at this point in the history
…er-25.0.6incompatible
  • Loading branch information
rneiva authored Sep 25, 2024
2 parents 75bedae + 64301f4 commit e1c5f7a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
15 changes: 9 additions & 6 deletions builder/go_versions.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +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 (
Expand All @@ -26,13 +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 {
Expand All @@ -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]
}

Expand Down
2 changes: 2 additions & 0 deletions chains.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e1c5f7a

Please sign in to comment.