Skip to content

Commit 31199f6

Browse files
JoaoBraveCodingJoaoBraveCoding
authored
Update to Go v1.24, dependencies and tools (#872)
* chore: update dependencies * fix race condition * chore: updated bingo tools * fix: move from the deprecated CFB to CTR * chore: updated some go expressions to recent standards * refactor: stop using deprecated WithRouteTag It was removed in open-telemetry/opentelemetry-go-contrib#8268 Approach was inspired by goadesign/goa#3897 * downgrade golangci-ling to 2.8.0 as it's the most recent version still on 1.24 * update github.com/efficientgo/e2e
1 parent 35c76e9 commit 31199f6

27 files changed

Lines changed: 851 additions & 739 deletions

‎.bingo/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@
1111
!variables.env
1212

1313
*tmp.mod
14+
*tmp.sum

‎.bingo/README.md‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
# Project Development Dependencies.
22

3-
This is directory which stores Go modules with pinned buildable package that is used within this repository, managed by https://github.com/bwplotka/bingo.
3+
This is directory which stores Go modules with pinned buildable package that is used within this repository, managed by <https://github.com/bwplotka/bingo>.
44

55
* Run `bingo get` to install all tools having each own module file in this directory.
6-
* Run `bingo get <tool>` to install <tool> that have own module file in this directory.
7-
* For Makefile: Make sure to put `include .bingo/Variables.mk` in your Makefile, then use $(<upper case tool name>) variable where <tool> is the .bingo/<tool>.mod.
6+
* Run `bingo get <tool>` to install `<tool>` that have own module file in this directory.
7+
* For Makefile: Make sure to put `include .bingo/Variables.mk` in your Makefile, then use `\$(<UPPER_CASE_TOOL_NAME>)` variable where `<tool>` is the .bingo/`<tool>.mod`.
88
* For shell: Run `source .bingo/variables.env` to source all environment variable for each tool.
9-
* For go: Import `.bingo/variables.go` to for variable names.
10-
* See https://github.com/bwplotka/bingo or -h on how to add, remove or change binaries dependencies.
9+
* See <https://github.com/bwplotka/bingo> or -h on how to add, remove or change binaries dependencies.
1110

1211
## Requirements
1312

14-
* Go 1.14+
13+
* Go 1.24.x or 1.25.x

‎.bingo/Variables.mk‎

Lines changed: 29 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
1-
# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.9. DO NOT EDIT.
1+
# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.10. DO NOT EDIT.
22
# All tools are designed to be build inside $GOBIN.
33
BINGO_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
44
GOPATH ?= $(shell go env GOPATH)
55
GOBIN ?= $(firstword $(subst :, ,${GOPATH}))/bin
66
GO ?= $(shell which go)
77

8+
# Ensure bingo-managed tools are always built for the host platform,
9+
# even when GOOS/GOARCH are set for cross-compilation of other targets.
10+
GOHOSTOS ?= $(shell $(GO) env GOHOSTOS)
11+
GOHOSTARCH ?= $(shell $(GO) env GOHOSTARCH)
12+
GOHOSTARM ?= $(shell $(GO) env GOHOSTARM)
13+
814
# Below generated variables ensure that every time a tool under each variable is invoked, the correct version
915
# will be used; reinstalling only if needed.
1016
# For example for bingo variable:
@@ -17,99 +23,87 @@ GO ?= $(shell which go)
1723
# @echo "Running bingo"
1824
# @$(BINGO) <flags/args..>
1925
#
20-
BINGO := $(GOBIN)/bingo-v0.9.0
26+
BINGO := $(GOBIN)/bingo-v0.10.0
2127
$(BINGO): $(BINGO_DIR)/bingo.mod
2228
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
23-
@echo "(re)installing $(GOBIN)/bingo-v0.9.0"
24-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=bingo.mod -o=$(GOBIN)/bingo-v0.9.0 "github.com/bwplotka/bingo"
25-
26-
DEX := $(GOBIN)/dex-v0.0.0-20200512115545-709d4169d646
27-
$(DEX): $(BINGO_DIR)/dex.mod
28-
@# 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)/dex-v0.0.0-20200512115545-709d4169d646"
30-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=dex.mod -o=$(GOBIN)/dex-v0.0.0-20200512115545-709d4169d646 "github.com/dexidp/dex/cmd/dex"
29+
@echo "(re)installing $(GOBIN)/bingo-v0.10.0"
30+
@cd $(BINGO_DIR) && GOWORK=off GOOS=$(GOHOSTOS) GOARCH=$(GOHOSTARCH) GOARM=$(GOHOSTARM) $(GO) build -mod=mod -modfile=bingo.mod -o=$(GOBIN)/bingo-v0.10.0 "github.com/bwplotka/bingo"
3131

3232
GOJSONTOYAML := $(GOBIN)/gojsontoyaml-v0.0.0-20200602132005-3697ded27e8c
3333
$(GOJSONTOYAML): $(BINGO_DIR)/gojsontoyaml.mod
3434
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
3535
@echo "(re)installing $(GOBIN)/gojsontoyaml-v0.0.0-20200602132005-3697ded27e8c"
36-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=gojsontoyaml.mod -o=$(GOBIN)/gojsontoyaml-v0.0.0-20200602132005-3697ded27e8c "github.com/brancz/gojsontoyaml"
36+
@cd $(BINGO_DIR) && GOWORK=off GOOS=$(GOHOSTOS) GOARCH=$(GOHOSTARCH) GOARM=$(GOHOSTARM) $(GO) build -mod=mod -modfile=gojsontoyaml.mod -o=$(GOBIN)/gojsontoyaml-v0.0.0-20200602132005-3697ded27e8c "github.com/brancz/gojsontoyaml"
3737

38-
GOLANGCI_LINT := $(GOBIN)/golangci-lint-v2.7.0
38+
GOLANGCI_LINT := $(GOBIN)/golangci-lint-v2.8.0
3939
$(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod
4040
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
41-
@echo "(re)installing $(GOBIN)/golangci-lint-v2.7.0"
42-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v2.7.0 "github.com/golangci/golangci-lint/v2/cmd/golangci-lint"
41+
@echo "(re)installing $(GOBIN)/golangci-lint-v2.8.0"
42+
@cd $(BINGO_DIR) && GOWORK=off GOOS=$(GOHOSTOS) GOARCH=$(GOHOSTARCH) GOARM=$(GOHOSTARM) $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v2.8.0 "github.com/golangci/golangci-lint/v2/cmd/golangci-lint"
4343

44-
GOYACC := $(GOBIN)/goyacc-v0.1.5
44+
GOYACC := $(GOBIN)/goyacc-v0.42.0
4545
$(GOYACC): $(BINGO_DIR)/goyacc.mod
4646
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
47-
@echo "(re)installing $(GOBIN)/goyacc-v0.1.5"
48-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=goyacc.mod -o=$(GOBIN)/goyacc-v0.1.5 "golang.org/x/tools/cmd/goyacc"
47+
@echo "(re)installing $(GOBIN)/goyacc-v0.42.0"
48+
@cd $(BINGO_DIR) && GOWORK=off GOOS=$(GOHOSTOS) GOARCH=$(GOHOSTARCH) GOARM=$(GOHOSTARM) $(GO) build -mod=mod -modfile=goyacc.mod -o=$(GOBIN)/goyacc-v0.42.0 "golang.org/x/tools/cmd/goyacc"
4949

5050
GUBERNATOR := $(GOBIN)/gubernator-v1.0.0-rc.3
5151
$(GUBERNATOR): $(BINGO_DIR)/gubernator.mod
5252
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
5353
@echo "(re)installing $(GOBIN)/gubernator-v1.0.0-rc.3"
54-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=gubernator.mod -o=$(GOBIN)/gubernator-v1.0.0-rc.3 "github.com/mailgun/gubernator/cmd/gubernator"
55-
56-
JB := $(GOBIN)/jb-v0.4.0
57-
$(JB): $(BINGO_DIR)/jb.mod
58-
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
59-
@echo "(re)installing $(GOBIN)/jb-v0.4.0"
60-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=jb.mod -o=$(GOBIN)/jb-v0.4.0 "github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb"
54+
@cd $(BINGO_DIR) && GOWORK=off GOOS=$(GOHOSTOS) GOARCH=$(GOHOSTARCH) GOARM=$(GOHOSTARM) $(GO) build -mod=mod -modfile=gubernator.mod -o=$(GOBIN)/gubernator-v1.0.0-rc.3 "github.com/mailgun/gubernator/cmd/gubernator"
6155

6256
JSONNET := $(GOBIN)/jsonnet-v0.21.0
6357
$(JSONNET): $(BINGO_DIR)/jsonnet.mod
6458
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
6559
@echo "(re)installing $(GOBIN)/jsonnet-v0.21.0"
66-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=jsonnet.mod -o=$(GOBIN)/jsonnet-v0.21.0 "github.com/google/go-jsonnet/cmd/jsonnet"
60+
@cd $(BINGO_DIR) && GOWORK=off GOOS=$(GOHOSTOS) GOARCH=$(GOHOSTARCH) GOARM=$(GOHOSTARM) $(GO) build -mod=mod -modfile=jsonnet.mod -o=$(GOBIN)/jsonnet-v0.21.0 "github.com/google/go-jsonnet/cmd/jsonnet"
6761

6862
JSONNETFMT := $(GOBIN)/jsonnetfmt-v0.21.0
6963
$(JSONNETFMT): $(BINGO_DIR)/jsonnetfmt.mod
7064
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
7165
@echo "(re)installing $(GOBIN)/jsonnetfmt-v0.21.0"
72-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=jsonnetfmt.mod -o=$(GOBIN)/jsonnetfmt-v0.21.0 "github.com/google/go-jsonnet/cmd/jsonnetfmt"
66+
@cd $(BINGO_DIR) && GOWORK=off GOOS=$(GOHOSTOS) GOARCH=$(GOHOSTARCH) GOARM=$(GOHOSTARM) $(GO) build -mod=mod -modfile=jsonnetfmt.mod -o=$(GOBIN)/jsonnetfmt-v0.21.0 "github.com/google/go-jsonnet/cmd/jsonnetfmt"
7367

7468
KUBECONFORM := $(GOBIN)/kubeconform-v0.7.0
7569
$(KUBECONFORM): $(BINGO_DIR)/kubeconform.mod
7670
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
7771
@echo "(re)installing $(GOBIN)/kubeconform-v0.7.0"
78-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=kubeconform.mod -o=$(GOBIN)/kubeconform-v0.7.0 "github.com/yannh/kubeconform/cmd/kubeconform"
72+
@cd $(BINGO_DIR) && GOWORK=off GOOS=$(GOHOSTOS) GOARCH=$(GOHOSTARCH) GOARM=$(GOHOSTARM) $(GO) build -mod=mod -modfile=kubeconform.mod -o=$(GOBIN)/kubeconform-v0.7.0 "github.com/yannh/kubeconform/cmd/kubeconform"
7973

8074
MDOX := $(GOBIN)/mdox-v0.9.1-0.20250909081353-65d927203516
8175
$(MDOX): $(BINGO_DIR)/mdox.mod
8276
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
8377
@echo "(re)installing $(GOBIN)/mdox-v0.9.1-0.20250909081353-65d927203516"
84-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=mdox.mod -o=$(GOBIN)/mdox-v0.9.1-0.20250909081353-65d927203516 "github.com/bwplotka/mdox"
78+
@cd $(BINGO_DIR) && GOWORK=off GOOS=$(GOHOSTOS) GOARCH=$(GOHOSTARCH) GOARM=$(GOHOSTARM) $(GO) build -mod=mod -modfile=mdox.mod -o=$(GOBIN)/mdox-v0.9.1-0.20250909081353-65d927203516 "github.com/bwplotka/mdox"
8579

8680
OAPI_CODEGEN := $(GOBIN)/oapi-codegen-v2.5.1
8781
$(OAPI_CODEGEN): $(BINGO_DIR)/oapi-codegen.mod
8882
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
8983
@echo "(re)installing $(GOBIN)/oapi-codegen-v2.5.1"
90-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=oapi-codegen.mod -o=$(GOBIN)/oapi-codegen-v2.5.1 "github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen"
84+
@cd $(BINGO_DIR) && GOWORK=off GOOS=$(GOHOSTOS) GOARCH=$(GOHOSTARCH) GOARM=$(GOHOSTARM) $(GO) build -mod=mod -modfile=oapi-codegen.mod -o=$(GOBIN)/oapi-codegen-v2.5.1 "github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen"
9185

92-
OPA := $(GOBIN)/opa-v1.5.1
86+
OPA := $(GOBIN)/opa-v1.13.2
9387
$(OPA): $(BINGO_DIR)/opa.mod
9488
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
95-
@echo "(re)installing $(GOBIN)/opa-v1.5.1"
96-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=opa.mod -o=$(GOBIN)/opa-v1.5.1 "github.com/open-policy-agent/opa"
89+
@echo "(re)installing $(GOBIN)/opa-v1.13.2"
90+
@cd $(BINGO_DIR) && GOWORK=off GOOS=$(GOHOSTOS) GOARCH=$(GOHOSTARCH) GOARM=$(GOHOSTARM) $(GO) build -mod=mod -modfile=opa.mod -o=$(GOBIN)/opa-v1.13.2 "github.com/open-policy-agent/opa"
9791

9892
PROTOC_GEN_GO := $(GOBIN)/protoc-gen-go-v1.4.2
9993
$(PROTOC_GEN_GO): $(BINGO_DIR)/protoc-gen-go.mod
10094
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
10195
@echo "(re)installing $(GOBIN)/protoc-gen-go-v1.4.2"
102-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=protoc-gen-go.mod -o=$(GOBIN)/protoc-gen-go-v1.4.2 "github.com/golang/protobuf/protoc-gen-go"
96+
@cd $(BINGO_DIR) && GOWORK=off GOOS=$(GOHOSTOS) GOARCH=$(GOHOSTARCH) GOARM=$(GOHOSTARM) $(GO) build -mod=mod -modfile=protoc-gen-go.mod -o=$(GOBIN)/protoc-gen-go-v1.4.2 "github.com/golang/protobuf/protoc-gen-go"
10397

10498
STYX := $(GOBIN)/styx-v0.0.0-20200109161911-78a77eb717b4
10599
$(STYX): $(BINGO_DIR)/styx.mod
106100
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
107101
@echo "(re)installing $(GOBIN)/styx-v0.0.0-20200109161911-78a77eb717b4"
108-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=styx.mod -o=$(GOBIN)/styx-v0.0.0-20200109161911-78a77eb717b4 "github.com/go-pluto/styx"
102+
@cd $(BINGO_DIR) && GOWORK=off GOOS=$(GOHOSTOS) GOARCH=$(GOHOSTARCH) GOARM=$(GOHOSTARM) $(GO) build -mod=mod -modfile=styx.mod -o=$(GOBIN)/styx-v0.0.0-20200109161911-78a77eb717b4 "github.com/go-pluto/styx"
109103

110104
UP := $(GOBIN)/up-v0.0.0-20200928171403-120d85735d11
111105
$(UP): $(BINGO_DIR)/up.mod
112106
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
113107
@echo "(re)installing $(GOBIN)/up-v0.0.0-20200928171403-120d85735d11"
114-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=up.mod -o=$(GOBIN)/up-v0.0.0-20200928171403-120d85735d11 "github.com/observatorium/up/cmd/up"
108+
@cd $(BINGO_DIR) && GOWORK=off GOOS=$(GOHOSTOS) GOARCH=$(GOHOSTARCH) GOARM=$(GOHOSTARM) $(GO) build -mod=mod -modfile=up.mod -o=$(GOBIN)/up-v0.0.0-20200928171403-120d85735d11 "github.com/observatorium/up/cmd/up"
115109

‎.bingo/bingo.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
22

3-
go 1.15
3+
go 1.24.9
44

5-
require github.com/bwplotka/bingo v0.9.0
5+
require github.com/bwplotka/bingo v0.10.0

0 commit comments

Comments
 (0)