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.

Sign up for GitHub

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

🌱 Bump to go1.23 #195

Merged
merged 5 commits into from
Jan 13, 2025
Merged

🌱 Bump to go1.23 #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2883b19
Bump to go1.23
Aug 29, 2024
93bc027
Update bingo deps
Jan 9, 2025
641149a
Address lint errors
Jan 9, 2025
7458148
Fix up golangci-lint version in GHA
Jan 9, 2025
97ab4fb
address lint issues
Jan 13, 2025
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
6 changes: 3 additions & 3 deletions .bingo/Variables.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ $(BINGO): $(BINGO_DIR)/bingo.mod
@echo "(re)installing $(GOBIN)/bingo-v0.9.0"
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=bingo.mod -o=$(GOBIN)/bingo-v0.9.0 "github.com/bwplotka/bingo"

GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.60.3
GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.63.4
$(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
@echo "(re)installing $(GOBIN)/golangci-lint-v1.60.3"
@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"
@echo "(re)installing $(GOBIN)/golangci-lint-v1.63.4"
@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"

2 changes: 1 addition & 1 deletion .bingo/golangci-lint.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ go 1.22.1

toolchain go1.22.3

require github.com/golangci/golangci-lint v1.60.3 // cmd/golangci-lint
require github.com/golangci/golangci-lint v1.63.4 // cmd/golangci-lint
170 changes: 170 additions & 0 deletions .bingo/golangci-lint.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .bingo/variables.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ fi

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

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

2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
go-version-file: "go.mod"
- uses: golangci/golangci-lint-action@v6
with:
version: v1.57
version: v1.63.4
args: --timeout 5m

go-apidiff:
Expand Down
4 changes: 3 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
module github.com/operator-framework/operator-lib

go 1.22.0
go 1.23.0

toolchain go1.23.4

require (
github.com/go-logr/logr v1.4.2
Expand Down
6 changes: 3 additions & 3 deletions internal/annotation/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ func makeCreateEventFor(obj client.Object) event.CreateEvent {
return e
}

func makeUpdateEventFor(old, new client.Object) event.UpdateEvent {
func makeUpdateEventFor(oldObj, newObj client.Object) event.UpdateEvent {
var e event.UpdateEvent
e.ObjectOld = old
e.ObjectNew = new
e.ObjectOld = oldObj
e.ObjectNew = newObj
return e
}

Expand Down
6 changes: 3 additions & 3 deletions predicate/predicate_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ func makeCreateEventFor(obj client.Object) event.CreateEvent {
return e
}

func makeUpdateEventFor(old, new client.Object) event.UpdateEvent {
func makeUpdateEventFor(oldObj, newObj client.Object) event.UpdateEvent {
var e event.UpdateEvent
e.ObjectOld = old
e.ObjectNew = new
e.ObjectOld = oldObj
e.ObjectNew = newObj
return e
}

Expand Down
Loading