Skip to content

Commit 8036bc2

Browse files
committed
upgrade go version to v1.24
1 parent 71222c1 commit 8036bc2

10 files changed

Lines changed: 11 additions & 11 deletions

File tree

.trunk/trunk.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ plugins:
1414
# Many linters and tools depend on runtimes - configure them here. (https://docs.trunk.io/runtimes)
1515
runtimes:
1616
enabled:
17-
- go@1.23.6
17+
- go@1.24.2
1818
1919
2020

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
###################### Stage I ######################
2-
FROM golang:1.24.1 AS builder
2+
FROM golang:1.24.2 AS builder
33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
bzip2=1.0.8-5+b1 \
55
git=1:2.39.5-0+deb12u2 \

dql/parser.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ func substituteVariables(gq *GraphQuery, vmap varMap) error {
507507
}
508508
depth, err := strconv.ParseUint(val.Value, 0, 64)
509509
if err != nil {
510-
return errors.Wrapf(err, varName+" should be type of integer")
510+
return errors.Wrapf(err, "%v should be type of integer", varName)
511511
}
512512
gq.RecurseArgs.Depth = depth
513513
}
@@ -521,7 +521,7 @@ func substituteVariables(gq *GraphQuery, vmap varMap) error {
521521
}
522522
allowLoop, err := strconv.ParseBool(val.Value)
523523
if err != nil {
524-
return errors.Wrapf(err, varName+"should be type of boolean")
524+
return errors.Wrapf(err, "%v should be type of boolean", varName)
525525
}
526526
gq.RecurseArgs.AllowLoop = allowLoop
527527
}

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/hypermodeinc/dgraph/v24
22

3-
go 1.23.6
3+
go 1.24.2
44

55
require (
66
contrib.go.opencensus.io/exporter/jaeger v0.2.1

graphql/e2e/custom_logic/cmd/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/hypermodeinc/dgraph/graphql/e2e/custom_logic/cmd
22

3-
go 1.23.6
3+
go 1.24.2
44

55
require (
66
github.com/graph-gophers/graphql-go v1.6.0

t/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# linux || darwin
77
GOOS ?= $(shell go env GOOS)
88
GOPATH ?= $(shell go env GOPATH)
9-
MIN_GO_VERSION = "1.23.6"
9+
MIN_GO_VERSION = "1.24.2"
1010

1111
all: test
1212

worker/draft.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ func (n *node) applyMutations(ctx context.Context, proposal *pb.Proposal) (rerr
603603
if errs == nil {
604604
errs = errors.New("Got error while running mutation")
605605
}
606-
errs = errors.Wrapf(err, errs.Error())
606+
errs = errors.Wrap(err, errs.Error())
607607
}
608608
}
609609
return errs

worker/groups.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -770,7 +770,7 @@ func (g *groupi) doSendMembership(tablets map[string]*pb.Tablet) error {
770770
if string(reply.GetData()) == "OK" {
771771
return nil
772772
}
773-
return errors.Errorf(string(reply.GetData()))
773+
return errors.New(string(reply.GetData()))
774774
}
775775

776776
// sendMembershipUpdates sends the membership update to Zero leader. If this Alpha is the leader, it

worker/mutation.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import (
3636
var (
3737
// ErrNonExistentTabletMessage is the error message sent when no tablet is serving a predicate.
3838
ErrNonExistentTabletMessage = "Requested predicate is not being served by any tablet"
39-
errNonExistentTablet = errors.Errorf(ErrNonExistentTabletMessage)
39+
errNonExistentTablet = errors.New(ErrNonExistentTabletMessage)
4040
errUnservedTablet = errors.Errorf("Tablet isn't being served by this instance")
4141
)
4242

x/error.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func Checkf(err error, format string, args ...interface{}) {
4444
// CheckfNoTrace is Checkf without a stack trace.
4545
func CheckfNoTrace(err error) {
4646
if err != nil {
47-
log.Fatalf(err.Error())
47+
log.Fatal(err.Error())
4848
}
4949
}
5050

0 commit comments

Comments
 (0)