Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated go version 1.23.3 #1026

Merged
merged 4 commits into from
Nov 21, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/coreum/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ func buildCoredInDocker(
default:
return errors.Errorf("building is not possible for platform %s", targetPlatform)
}
envs = append(envs, fmt.Sprintf("CC=%s", cc))
envs = append(envs, "CC="+cc)

versionLDFlags, err := coredVersionLDFlags(ctx, buildTags, mod)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion build/coreum/generate-proto-breaking.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ func breakingProto(ctx context.Context, deps types.DepsFunc) error {
args := []string{
"--buf-breaking_out=.",
fmt.Sprintf("--buf-breaking_opt=%s", configBuf),
fmt.Sprintf("--plugin=%s", tools.Path("bin/protoc-gen-buf-breaking", tools.TargetPlatformLocal)),
"--plugin=" + tools.Path("bin/protoc-gen-buf-breaking", tools.TargetPlatformLocal),
}

args = append(args, includeArgs...)
Expand Down
3 changes: 1 addition & 2 deletions build/coreum/generate-proto-docs.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package coreum

import (
"context"
"fmt"
"os"
"os/exec"
"path/filepath"
Expand Down Expand Up @@ -51,7 +50,7 @@ func executeProtocCommand(ctx context.Context, deps types.DepsFunc, includeDirs,

args := []string{
"--doc_out=docs",
fmt.Sprintf("--plugin=%s", tools.Path("bin/protoc-gen-doc", tools.TargetPlatformLocal)),
"--plugin=" + tools.Path("bin/protoc-gen-doc", tools.TargetPlatformLocal),
"--doc_opt=docs/api.tmpl.md,api.md",
}

Expand Down
5 changes: 2 additions & 3 deletions build/coreum/generate-proto-go.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package coreum
import (
"bufio"
"context"
"fmt"
"io"
"io/fs"
"os"
Expand Down Expand Up @@ -61,8 +60,8 @@ func executeGoProtocCommand(ctx context.Context, deps types.DepsFunc, includeDir
args := []string{
"--gocosmos_out=plugins=interfacetype+grpc,Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types:.",
"--grpc-gateway_out=logtostderr=true:.",
fmt.Sprintf("--plugin=%s", tools.Path("bin/protoc-gen-gocosmos", tools.TargetPlatformLocal)),
fmt.Sprintf("--plugin=%s", tools.Path("bin/protoc-gen-grpc-gateway", tools.TargetPlatformLocal)),
"--plugin=" + tools.Path("bin/protoc-gen-gocosmos", tools.TargetPlatformLocal),
"--plugin=" + tools.Path("bin/protoc-gen-grpc-gateway", tools.TargetPlatformLocal),
}

for _, path := range includeDirs {
Expand Down
2 changes: 1 addition & 1 deletion build/coreum/generate-proto-lint.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func executeLintProtocCommand(ctx context.Context, deps types.DepsFunc, includeD
args := []string{
"--buf-lint_out=.",
fmt.Sprintf("--buf-lint_opt=%s", configLint),
fmt.Sprintf("--plugin=%s", tools.Path("bin/protoc-gen-buf-lint", tools.TargetPlatformLocal)),
"--plugin=" + tools.Path("bin/protoc-gen-buf-lint", tools.TargetPlatformLocal),
}

for _, path := range includeDirs {
Expand Down
2 changes: 1 addition & 1 deletion build/coreum/generate-proto-openapi.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ func executeOpenAPIProtocCommand(ctx context.Context, deps types.DepsFunc, inclu

args := []string{
"--openapiv2_out=logtostderr=true,allow_merge=true,json_names_for_fields=false,fqn_for_openapi_name=true,simple_operation_ids=true,Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types:.", //nolint:lll // breaking down this string will make it more complicated.
fmt.Sprintf("--plugin=%s", tools.Path("bin/protoc-gen-openapiv2", tools.TargetPlatformLocal)),
"--plugin=" + tools.Path("bin/protoc-gen-openapiv2", tools.TargetPlatformLocal),
}

for _, path := range includeDirs {
Expand Down
4 changes: 2 additions & 2 deletions build/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/CoreumFoundation/coreum/build

go 1.22.4
go 1.23.3

replace github.com/CoreumFoundation/coreum/v5 => ../

Expand Down Expand Up @@ -28,7 +28,7 @@ replace (
require (
github.com/CoreumFoundation/coreum-tools v0.4.1-0.20240321120602-0a9c50facc68
github.com/CoreumFoundation/coreum/v5 v5.0.0-20241022051641-b49ec5faa621
github.com/CoreumFoundation/crust v0.0.0-20241029185440-e352dde6f2b2
github.com/CoreumFoundation/crust v0.0.0-20241119103533-4a2dd90bbd7c
github.com/iancoleman/strcase v0.3.0
github.com/pkg/errors v0.9.1
github.com/samber/lo v1.39.0
Expand Down
8 changes: 6 additions & 2 deletions build/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,12 @@ github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbi
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/CoreumFoundation/coreum-tools v0.4.1-0.20240321120602-0a9c50facc68 h1:Tb9avuSQW3smVGrUnDh/Y+ML4eK802UsvJNZHsBgOGg=
github.com/CoreumFoundation/coreum-tools v0.4.1-0.20240321120602-0a9c50facc68/go.mod h1:VD93vCHkxYaT/RhOesXTFgd/GQDW54tr0BqGi5JU1c0=
github.com/CoreumFoundation/crust v0.0.0-20241029185440-e352dde6f2b2 h1:YCaird/0FrYgMAajomVBJ/aClatBcorVi1vAmYNjH2w=
github.com/CoreumFoundation/crust v0.0.0-20241029185440-e352dde6f2b2/go.mod h1:95ZdELt65yNef7qty4vvRBcBgkgw0L0+td2tNa/JKTM=
github.com/CoreumFoundation/crust v0.0.0-20241119084204-806f2328b7f9 h1:b8hiKQL7ykNC6YdMkd0Diqst217W2hqT48Oyugr4wvw=
github.com/CoreumFoundation/crust v0.0.0-20241119084204-806f2328b7f9/go.mod h1:DC2Jq9oOJgDccdSqwxggqoFJ+EMn1wl8hMXAnnK4DSs=
github.com/CoreumFoundation/crust v0.0.0-20241119093707-e6aa58771681 h1:GNKt++3Il0GUD0jOvF5/vj5V9HFl/pHkEvRo4vi3vzQ=
github.com/CoreumFoundation/crust v0.0.0-20241119093707-e6aa58771681/go.mod h1:DC2Jq9oOJgDccdSqwxggqoFJ+EMn1wl8hMXAnnK4DSs=
github.com/CoreumFoundation/crust v0.0.0-20241119103533-4a2dd90bbd7c h1:WOM8Nu9APDJayYpF7vSO8ZUmossqXo0VQB92q8f7BU4=
github.com/CoreumFoundation/crust v0.0.0-20241119103533-4a2dd90bbd7c/go.mod h1:DC2Jq9oOJgDccdSqwxggqoFJ+EMn1wl8hMXAnnK4DSs=
github.com/CosmWasm/wasmd v0.53.0 h1:kdaoAi20bIb4VCsxw9pRaT2g5PpIp82Wqrr9DRVN9ao=
github.com/CosmWasm/wasmd v0.53.0/go.mod h1:FJl/aWjdpGof3usAMFQpDe07Rkx77PUzp0cygFMOvtw=
github.com/CosmWasm/wasmvm/v2 v2.1.2 h1:GkJ5bAsRlLHfIQVg/FY1VHwLyBwlCjAhDea0B8L+e20=
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/CoreumFoundation/coreum/v5

go 1.22.4
go 1.23.3

replace (
// TODO(https://github.com/cosmos/rosetta/issues/76): Rosetta requires cosmossdk.io/core v0.12.0 erroneously but
Expand Down
2 changes: 1 addition & 1 deletion go.work
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
go 1.22.4
go 1.23.3

use .

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/CoreumFoundation/coreum/v5/integration-tests

go 1.22.4
go 1.23.3

replace (
// cosmos keyring
Expand Down
Loading