Skip to content

Commit b84152d

Browse files
committed
Update to golang 1.25
Requires goreleaser v2.11.2 Updating the darwin build as done downstream Signed-off-by: Todd Short <todd.short@me.com>
1 parent de37a21 commit b84152d

File tree

9 files changed

+718
-1297
lines changed

9 files changed

+718
-1297
lines changed

.bingo/Variables.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ $(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod
3535
@echo "(re)installing $(GOBIN)/golangci-lint-v1.64.8"
3636
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.64.8 "github.com/golangci/golangci-lint/cmd/golangci-lint"
3737

38-
GORELEASER := $(GOBIN)/goreleaser-v1.26.2
38+
GORELEASER := $(GOBIN)/goreleaser-v2.12.7
3939
$(GORELEASER): $(BINGO_DIR)/goreleaser.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)/goreleaser-v1.26.2"
42-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=goreleaser.mod -o=$(GOBIN)/goreleaser-v1.26.2 "github.com/goreleaser/goreleaser"
41+
@echo "(re)installing $(GOBIN)/goreleaser-v2.12.7"
42+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=goreleaser.mod -o=$(GOBIN)/goreleaser-v2.12.7 "github.com/goreleaser/goreleaser/v2"
4343

4444
PROTOC_GEN_GO_GRPC := $(GOBIN)/protoc-gen-go-grpc-v1.3.0
4545
$(PROTOC_GEN_GO_GRPC): $(BINGO_DIR)/protoc-gen-go-grpc.mod

.bingo/goreleaser.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.22.2
3+
go 1.25.3
44

5-
require github.com/goreleaser/goreleaser v1.26.2
5+
require github.com/goreleaser/goreleaser/v2 v2.12.7

.bingo/goreleaser.sum

Lines changed: 694 additions & 1279 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
@@ -14,7 +14,7 @@ GINKGO="${GOBIN}/ginkgo-v2.23.4"
1414

1515
GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.64.8"
1616

17-
GORELEASER="${GOBIN}/goreleaser-v1.26.2"
17+
GORELEASER="${GOBIN}/goreleaser-v2.12.7"
1818

1919
PROTOC_GEN_GO_GRPC="${GOBIN}/protoc-gen-go-grpc-v1.3.0"
2020

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ build: clean $(CMDS) $(OPM)
6262
cross: opm_version_flags=-ldflags "-X '$(PKG)/cmd/opm/version.gitCommit=$(GIT_COMMIT)' -X '$(PKG)/cmd/opm/version.opmVersion=$(OPM_VERSION)' -X '$(PKG)/cmd/opm/version.buildDate=$(BUILD_DATE)'"
6363
cross:
6464
ifeq ($(shell go env GOARCH),amd64)
65-
GOOS=darwin CC=o64-clang CXX=o64-clang++ CGO_ENABLED=1 $(GO) build $(opm_version_flags) -tags=$(TAGS) -o "bin/darwin-amd64-opm" --ldflags "-extld=o64-clang" ./cmd/opm
65+
GOOS=darwin CC=o64-clang CXX=o64-clang++ CGO_ENABLED=1 CGO_LDFLAGS='-Wl,-undefined,dynamic_lookup' $(GO) build $(opm_version_flags) -tags=$(TAGS) -o "bin/darwin-amd64-opm" --ldflags "-extld=o64-clang -extldflags=-Wl,-undefined,dynamic_lookup" ./cmd/opm
6666
GOOS=windows CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ CGO_ENABLED=1 $(GO) build $(opm_version_flags) -tags=$(TAGS) -o "bin/windows-amd64-opm" --ldflags "-extld=x86_64-w64-mingw32-gcc" -buildmode=exe ./cmd/opm
6767
endif
6868

@@ -163,7 +163,7 @@ windows-goreleaser-install:
163163
# This is done to ensure the same version of goreleaser is used across all platforms
164164
mkdir -p $(dir $(GORELEASER))
165165
@echo "(re)installing $(GORELEASER)"
166-
GOWORK=off $(GO) build -mod=mod -modfile=.bingo/goreleaser.mod -o=$(GORELEASER) "github.com/goreleaser/goreleaser"
166+
GOWORK=off $(GO) build -mod=mod -modfile=.bingo/goreleaser.mod -o=$(GORELEASER) "github.com/goreleaser/goreleaser/v2"
167167

168168
# tagged-or-empty returns $(OPM_IMAGE_REPO):$(1) when HEAD is assigned a non-prerelease semver tag,
169169
# otherwise the empty string. An empty string causes goreleaser to skip building

go.mod

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

3-
go 1.24.6
3+
go 1.25.3
44

55
require (
66
github.com/akrylysov/pogreb v0.10.2

release/goreleaser.darwin.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
version: 2
12
builds:
23
- id: darwin-amd64
34
main: ./cmd/opm
@@ -36,14 +37,15 @@ builds:
3637
ldflags: *build-ldflags
3738
archives:
3839
- id: opm
39-
builds:
40+
ids:
4041
- darwin-amd64
4142
- darwin-arm64
42-
format: binary
43+
formats:
44+
- binary
4345
name_template: "{{ .Os }}-{{ .Arch }}-{{ .Binary }}"
4446
checksum:
4547
name_template: 'checksums.txt'
4648
snapshot:
47-
name_template: "{{ .Env.OPM_VERSION }}"
49+
version_template: "{{ .Env.OPM_VERSION }}"
4850
release:
4951
disable: true

release/goreleaser.linux.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
version: 2
12
builds:
23
- id: linux-amd64
34
main: ./cmd/opm
@@ -69,12 +70,13 @@ builds:
6970
ldflags: *build-ldflags
7071
archives:
7172
- id: opm
72-
builds:
73+
ids:
7374
- linux-amd64
7475
- linux-arm64
7576
- linux-ppc64le
7677
- linux-s390x
77-
format: binary
78+
formats:
79+
- binary
7880
name_template: "{{ .Os }}-{{ .Arch }}-{{ .Binary }}"
7981
dockers:
8082
- image_templates:
@@ -153,6 +155,6 @@ docker_manifests:
153155
checksum:
154156
name_template: 'checksums.txt'
155157
snapshot:
156-
name_template: "{{ .Env.OPM_VERSION }}"
158+
version_template: "{{ .Env.OPM_VERSION }}"
157159
release:
158160
disable: true

release/goreleaser.windows.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
version: 2
12
builds:
23
- id: windows-amd64
34
main: ./cmd/opm
@@ -23,13 +24,14 @@ builds:
2324
- -X {{ .Env.PKG }}/cmd/opm/version.buildDate={{ .Env.BUILD_DATE }}
2425
archives:
2526
- id: opm
26-
builds:
27+
ids:
2728
- windows-amd64
28-
format: binary
29+
formats:
30+
- binary
2931
name_template: "{{ .Os }}-{{ .Arch }}-{{ .Binary }}"
3032
checksum:
3133
name_template: 'checksums.txt'
3234
snapshot:
33-
name_template: "{{ .Env.OPM_VERSION }}"
35+
version_template: "{{ .Env.OPM_VERSION }}"
3436
release:
3537
disable: true

0 commit comments

Comments
 (0)