Skip to content

Commit be2540b

Browse files
perdasilvaPer Goncalves da Silva
andauthored
🌱 Bump to go1.23 (#195)
* Bump to go1.23 Signed-off-by: Per Goncalves da Silva <[email protected]> * Update bingo deps Signed-off-by: Per Goncalves da Silva <[email protected]> * Address lint errors Signed-off-by: Per Goncalves da Silva <[email protected]> * Fix up golangci-lint version in GHA Signed-off-by: Per Goncalves da Silva <[email protected]> * address lint issues Signed-off-by: Per Goncalves da Silva <[email protected]> --------- Signed-off-by: Per Goncalves da Silva <[email protected]> Co-authored-by: Per Goncalves da Silva <[email protected]>
1 parent b42b4a9 commit be2540b

File tree

8 files changed

+185
-13
lines changed

8 files changed

+185
-13
lines changed

.bingo/Variables.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ $(BINGO): $(BINGO_DIR)/bingo.mod
2323
@echo "(re)installing $(GOBIN)/bingo-v0.9.0"
2424
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=bingo.mod -o=$(GOBIN)/bingo-v0.9.0 "github.com/bwplotka/bingo"
2525

26-
GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.60.3
26+
GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.63.4
2727
$(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod
2828
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
29-
@echo "(re)installing $(GOBIN)/golangci-lint-v1.60.3"
30-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.60.3 "github.com/golangci/golangci-lint/cmd/golangci-lint"
29+
@echo "(re)installing $(GOBIN)/golangci-lint-v1.63.4"
30+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.63.4 "github.com/golangci/golangci-lint/cmd/golangci-lint"
3131

.bingo/golangci-lint.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ go 1.22.1
44

55
toolchain go1.22.3
66

7-
require github.com/golangci/golangci-lint v1.60.3 // cmd/golangci-lint
7+
require github.com/golangci/golangci-lint v1.63.4 // cmd/golangci-lint

.bingo/golangci-lint.sum

Lines changed: 170 additions & 0 deletions
Large diffs are not rendered by default.

.bingo/variables.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ fi
1010

1111
BINGO="${GOBIN}/bingo-v0.9.0"
1212

13-
GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.60.3"
13+
GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.63.4"
1414

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
go-version-file: "go.mod"
3333
- uses: golangci/golangci-lint-action@v6
3434
with:
35-
version: v1.57
35+
version: v1.63.4
3636
args: --timeout 5m
3737

3838
go-apidiff:

go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/operator-framework/operator-lib
22

3-
go 1.22.0
3+
go 1.23.0
4+
5+
toolchain go1.23.4
46

57
require (
68
github.com/go-logr/logr v1.4.2

internal/annotation/suite_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ func makeCreateEventFor(obj client.Object) event.CreateEvent {
3434
return e
3535
}
3636

37-
func makeUpdateEventFor(old, new client.Object) event.UpdateEvent {
37+
func makeUpdateEventFor(oldObj, newObj client.Object) event.UpdateEvent {
3838
var e event.UpdateEvent
39-
e.ObjectOld = old
40-
e.ObjectNew = new
39+
e.ObjectOld = oldObj
40+
e.ObjectNew = newObj
4141
return e
4242
}
4343

predicate/predicate_suite_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ func makeCreateEventFor(obj client.Object) event.CreateEvent {
3434
return e
3535
}
3636

37-
func makeUpdateEventFor(old, new client.Object) event.UpdateEvent {
37+
func makeUpdateEventFor(oldObj, newObj client.Object) event.UpdateEvent {
3838
var e event.UpdateEvent
39-
e.ObjectOld = old
40-
e.ObjectNew = new
39+
e.ObjectOld = oldObj
40+
e.ObjectNew = newObj
4141
return e
4242
}
4343

0 commit comments

Comments
 (0)