Skip to content

Commit 475df0e

Browse files
authored
chore: bump Go version to 1.25.3 (#869)
1 parent 19c9e73 commit 475df0e

File tree

3 files changed

+17
-15
lines changed

3 files changed

+17
-15
lines changed

Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ RUN yum --assumeyes install \
1010
&& yum clean all;
1111

1212
### Build backplane-cli
13-
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.24 as bp-cli-builder
13+
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25 as bp-cli-builder
1414

1515

1616
# Configure the env
1717

18-
RUN go env -w GOTOOLCHAIN=go1.24.4+auto
18+
RUN go env -w GOTOOLCHAIN=go1.25.3+auto
1919

2020
#Environment variables
2121
ENV GOOS=linux GO111MODULE=on GOPROXY=https://proxy.golang.org
2222
ENV GOBIN=/gobin GOPATH=/usr/src/go CGO_ENABLED=0
23-
ENV GOTOOLCHAIN=go1.24.4+auto
23+
ENV GOTOOLCHAIN=go1.25.3+auto
2424

2525
# Directory for the binary
2626
RUN mkdir /out
@@ -35,16 +35,16 @@ RUN cp ./ocm-backplane /out
3535
RUN chmod -R +x /out
3636

3737
### Build dependencies
38-
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.24 as dep-builder
38+
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25 as dep-builder
3939

40-
# Ensure we can use Go 1.24.4
41-
ENV GOTOOLCHAIN=go1.24.4+auto
40+
# Ensure we can use Go version as we want
41+
ENV GOTOOLCHAIN=go1.25.3+auto
4242

4343
ARG GITHUB_URL="https://api.github.com"
4444
ARG GITHUB_TOKEN=""
4545

4646
# Replace version with a version number to pin a specific version (eg: "4.7.8")
47-
ARG OC_VERSION="stable-4.16"
47+
ARG OC_VERSION="stable-4.20"
4848
ENV OC_URL="https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/${OC_VERSION}"
4949

5050
# Replace "/latest" with "/tags/{tag}" to pin to a specific version (eg: "/tags/v0.4.0")

Makefile

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ GO_BUILD_FLAGS :=-tags 'include_gcs include_oss containers_image_openpgp gssapi'
99
GO_BUILD_FLAGS_DARWIN :=-tags 'include_gcs include_oss containers_image_openpgp'
1010
GO_BUILD_FLAGS_LINUX_CROSS :=-tags 'include_gcs include_oss containers_image_openpgp'
1111

12+
GO_VERSION=go1.25.3+auto
13+
1214
GOLANGCI_LINT_VERSION=v2.5.0
1315
GORELEASER_VERSION=v1.14.1
1416
GOVULNCHECK_VERSION=v1.1.4
@@ -49,13 +51,13 @@ OUTPUT_DIR :=_output
4951
CROSS_BUILD_BINDIR :=$(OUTPUT_DIR)/bin
5052

5153
build: clean
52-
env -u GOTOOLCHAIN GOTOOLCHAIN=go1.24.4+auto go build -o ocm-backplane ./cmd/ocm-backplane || exit 1
54+
env -u GOTOOLCHAIN GOTOOLCHAIN=$(GO_VERSION) go build -o ocm-backplane ./cmd/ocm-backplane || exit 1
5355

5456
build-static: clean
55-
env -u GOTOOLCHAIN GOTOOLCHAIN=go1.24.4+auto go build -a -installsuffix cgo -ldflags '-extldflags "-static"' -o ocm-backplane ./cmd/ocm-backplane || exit 1
57+
env -u GOTOOLCHAIN GOTOOLCHAIN=$(GO_VERSION) go build -a -installsuffix cgo -ldflags '-extldflags "-static"' -o ocm-backplane ./cmd/ocm-backplane || exit 1
5658

5759
install:
58-
GOTOOLCHAIN=go1.24.4+auto go install ./cmd/ocm-backplane
60+
GOTOOLCHAIN=$(GO_VERSION) go install ./cmd/ocm-backplane
5961

6062
clean:
6163
rm -f ocm-backplane
@@ -82,18 +84,18 @@ release-with-note: ensure-goreleaser
8284
goreleaser release --rm-dist --release-notes="$(NOTE)"
8385

8486
test:
85-
env -u GOTOOLCHAIN GOTOOLCHAIN=go1.24.4+auto go test -v $(TESTOPTS) ./...
87+
env -u GOTOOLCHAIN GOTOOLCHAIN=$(GO_VERSION) go test -v $(TESTOPTS) ./...
8688

8789
.PHONY: coverage
8890
coverage:
8991
hack/codecov.sh
9092

9193
cross-build-darwin-amd64:
92-
+@GOOS=darwin GOARCH=amd64 GOTOOLCHAIN=go1.24.4+auto go build $(GO_BUILD_FLAGS_DARWIN) -o $(CROSS_BUILD_BINDIR)/ocm-backplane_darwin_amd64 ./cmd/ocm-backplane
94+
+@GOOS=darwin GOARCH=amd64 GOTOOLCHAIN=$(GO_VERSION) go build $(GO_BUILD_FLAGS_DARWIN) -o $(CROSS_BUILD_BINDIR)/ocm-backplane_darwin_amd64 ./cmd/ocm-backplane
9395
.PHONY: cross-build-darwin-amd64
9496

9597
cross-build-linux-amd64:
96-
+@GOOS=linux GOARCH=amd64 GOTOOLCHAIN=go1.24.4+auto go build $(GO_BUILD_FLAGS_LINUX_CROSS) -o $(CROSS_BUILD_BINDIR)/ocm-backplane_linux_amd64 ./cmd/ocm-backplane
98+
+@GOOS=linux GOARCH=amd64 GOTOOLCHAIN=$(GO_VERSION) go build $(GO_BUILD_FLAGS_LINUX_CROSS) -o $(CROSS_BUILD_BINDIR)/ocm-backplane_linux_amd64 ./cmd/ocm-backplane
9799
.PHONY: cross-build-linux-amd64
98100

99101
cross-build: cross-build-darwin-amd64 cross-build-linux-amd64
@@ -106,7 +108,7 @@ clean-cross-build:
106108

107109
.PHONY: generate
108110
generate:
109-
GOTOOLCHAIN=go1.24.4+auto go generate ./...
111+
GOTOOLCHAIN=$(GO_VERSION) go generate ./...
110112

111113
.PHONY: mock-gen
112114
mock-gen:

go.mod

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

3-
go 1.24.4
3+
go 1.25.3
44

55
require (
66
github.com/Masterminds/semver v1.5.0

0 commit comments

Comments
 (0)