From 522cc9f0da01d29c6386cf5d9df81b256eed50ac Mon Sep 17 00:00:00 2001 From: MitaliBhalla Date: Mon, 1 Dec 2025 10:35:54 +0530 Subject: [PATCH 1/8] Updating go version to 1.24.6 --- Dockerfile | 6 +++--- README.md | 2 +- go.mod | 4 +--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 088a7816..f89666a0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,12 +10,12 @@ RUN yum --assumeyes install \ && yum clean all; ### Build backplane-cli -FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23 as bp-cli-builder +FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.24 as bp-cli-builder # Configure the env -RUN go env -w GOTOOLCHAIN=go1.23.6+auto +RUN go env -w GOTOOLCHAIN=go1.24.6+auto #Environment variables ENV GOOS=linux GO111MODULE=on GOPROXY=https://proxy.golang.org @@ -34,7 +34,7 @@ RUN cp ./ocm-backplane /out RUN chmod -R +x /out ### Build dependencies -FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23 as dep-builder +FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.24 as dep-builder ARG GITHUB_URL="https://api.github.com" diff --git a/README.md b/README.md index 799760c0..a12d6494 100644 --- a/README.md +++ b/README.md @@ -482,7 +482,7 @@ Wait for the release repository PR to be merged by the CI bot. Update the Go version in the Backplane CLI Dockerfile and verify CI builds: ``` -FROM golang:1.21 # Update version to match release PR +FROM golang:1.24.6 # Update version to match release PR ``` Example Implementation: PR [#636](https://github.com/openshift/backplane-cli/pull/636): OSD-28717 Fix build failures Update the dockerfile of backplane-cli with the latest go version and check if build passes. diff --git a/go.mod b/go.mod index 5fd5d923..dd7dc8bb 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/openshift/backplane-cli -go 1.24.0 - -toolchain go1.24.1 +go 1.24.6 require ( github.com/Masterminds/semver v1.5.0 From 27290bb9b4c59ca1edf676f8af56d6cbffc38a74 Mon Sep 17 00:00:00 2001 From: MitaliBhalla Date: Mon, 1 Dec 2025 10:44:56 +0530 Subject: [PATCH 2/8] Updating CI env to not use GOTOOLCHAIN=local --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index f89666a0..508f6f30 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,6 +20,7 @@ RUN go env -w GOTOOLCHAIN=go1.24.6+auto #Environment variables ENV GOOS=linux GO111MODULE=on GOPROXY=https://proxy.golang.org ENV GOBIN=/gobin GOPATH=/usr/src/go CGO_ENABLED=0 +ENV GOTOOLCHAIN=go1.24.6+auto # Directory for the binary RUN mkdir /out @@ -36,6 +37,8 @@ RUN chmod -R +x /out ### Build dependencies FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.24 as dep-builder +# Ensure we can use Go 1.24.6 +ENV GOTOOLCHAIN=go1.24.6+auto ARG GITHUB_URL="https://api.github.com" ARG GITHUB_TOKEN="" From 34ac0dd812442dd7839f483bcd336f169b3f9fa9 Mon Sep 17 00:00:00 2001 From: MitaliBhalla Date: Mon, 1 Dec 2025 10:57:20 +0530 Subject: [PATCH 3/8] Updated Makefile to set GOTOOLCHAIN=go1.24.6+auto for all Go commands --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 801e3751..f3012f08 100644 --- a/Makefile +++ b/Makefile @@ -49,13 +49,13 @@ OUTPUT_DIR :=_output CROSS_BUILD_BINDIR :=$(OUTPUT_DIR)/bin build: clean - go build -o ocm-backplane ./cmd/ocm-backplane || exit 1 + GOTOOLCHAIN=go1.24.6+auto go build -o ocm-backplane ./cmd/ocm-backplane || exit 1 build-static: clean - go build -a -installsuffix cgo -ldflags '-extldflags "-static"' -o ocm-backplane ./cmd/ocm-backplane || exit 1 + GOTOOLCHAIN=go1.24.6+auto go build -a -installsuffix cgo -ldflags '-extldflags "-static"' -o ocm-backplane ./cmd/ocm-backplane || exit 1 install: - go install ./cmd/ocm-backplane + GOTOOLCHAIN=go1.24.6+auto go install ./cmd/ocm-backplane clean: rm -f ocm-backplane @@ -82,18 +82,18 @@ release-with-note: ensure-goreleaser goreleaser release --rm-dist --release-notes="$(NOTE)" test: - go test -v $(TESTOPTS) ./... + GOTOOLCHAIN=go1.24.6+auto go test -v $(TESTOPTS) ./... .PHONY: coverage coverage: hack/codecov.sh cross-build-darwin-amd64: - +@GOOS=darwin GOARCH=amd64 go build $(GO_BUILD_FLAGS_DARWIN) -o $(CROSS_BUILD_BINDIR)/ocm-backplane_darwin_amd64 ./cmd/ocm-backplane + +@GOOS=darwin GOARCH=amd64 GOTOOLCHAIN=go1.24.6+auto go build $(GO_BUILD_FLAGS_DARWIN) -o $(CROSS_BUILD_BINDIR)/ocm-backplane_darwin_amd64 ./cmd/ocm-backplane .PHONY: cross-build-darwin-amd64 cross-build-linux-amd64: - +@GOOS=linux GOARCH=amd64 go build $(GO_BUILD_FLAGS_LINUX_CROSS) -o $(CROSS_BUILD_BINDIR)/ocm-backplane_linux_amd64 ./cmd/ocm-backplane + +@GOOS=linux GOARCH=amd64 GOTOOLCHAIN=go1.24.6+auto go build $(GO_BUILD_FLAGS_LINUX_CROSS) -o $(CROSS_BUILD_BINDIR)/ocm-backplane_linux_amd64 ./cmd/ocm-backplane .PHONY: cross-build-linux-amd64 cross-build: cross-build-darwin-amd64 cross-build-linux-amd64 @@ -106,7 +106,7 @@ clean-cross-build: .PHONY: generate generate: - go generate ./... + GOTOOLCHAIN=go1.24.6+auto go generate ./... .PHONY: mock-gen mock-gen: From 3edd163afb09f2404a0c7e4d961e439eb239bf84 Mon Sep 17 00:00:00 2001 From: MitaliBhalla Date: Mon, 1 Dec 2025 11:04:45 +0530 Subject: [PATCH 4/8] Updated build environment --- .ci-operator.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 2d9f57ed..f6893ca8 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: name: builder namespace: ocp - tag: rhel-8-golang-1.20-openshift-4.14 + tag: rhel-9-golang-1.24-openshift-4.17 From 31fc3e72f4650a0b94d7c8ec874bfada590e92b4 Mon Sep 17 00:00:00 2001 From: MitaliBhalla Date: Mon, 1 Dec 2025 11:15:29 +0530 Subject: [PATCH 5/8] CI fixtures --- .ci-operator.yaml | 2 +- Makefile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index f6893ca8..521c4f16 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: name: builder namespace: ocp - tag: rhel-9-golang-1.24-openshift-4.17 + tag: rhel-9-golang-1.24-openshift-4.16 diff --git a/Makefile b/Makefile index f3012f08..9688cb9e 100644 --- a/Makefile +++ b/Makefile @@ -49,10 +49,10 @@ OUTPUT_DIR :=_output CROSS_BUILD_BINDIR :=$(OUTPUT_DIR)/bin build: clean - GOTOOLCHAIN=go1.24.6+auto go build -o ocm-backplane ./cmd/ocm-backplane || exit 1 + env -u GOTOOLCHAIN GOTOOLCHAIN=go1.24.6+auto go build -o ocm-backplane ./cmd/ocm-backplane || exit 1 build-static: clean - GOTOOLCHAIN=go1.24.6+auto go build -a -installsuffix cgo -ldflags '-extldflags "-static"' -o ocm-backplane ./cmd/ocm-backplane || exit 1 + env -u GOTOOLCHAIN GOTOOLCHAIN=go1.24.6+auto go build -a -installsuffix cgo -ldflags '-extldflags "-static"' -o ocm-backplane ./cmd/ocm-backplane || exit 1 install: GOTOOLCHAIN=go1.24.6+auto go install ./cmd/ocm-backplane @@ -82,7 +82,7 @@ release-with-note: ensure-goreleaser goreleaser release --rm-dist --release-notes="$(NOTE)" test: - GOTOOLCHAIN=go1.24.6+auto go test -v $(TESTOPTS) ./... + env -u GOTOOLCHAIN GOTOOLCHAIN=go1.24.6+auto go test -v $(TESTOPTS) ./... .PHONY: coverage coverage: From 6c1e1dabb405f5f5a876a11219bcf580611a3013 Mon Sep 17 00:00:00 2001 From: MitaliBhalla Date: Mon, 1 Dec 2025 11:24:35 +0530 Subject: [PATCH 6/8] updating go toolset image --- .ci-operator.yaml | 6 +++--- Dockerfile | 6 +++--- Makefile | 14 +++++++------- README.md | 2 +- go.mod | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 521c4f16..460457bf 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: - name: builder - namespace: ocp - tag: rhel-9-golang-1.24-openshift-4.16 + name: go-toolset + namespace: rhel9 + tag: "1.25" diff --git a/Dockerfile b/Dockerfile index 508f6f30..7434dbc5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,12 +15,12 @@ FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.24 # Configure the env -RUN go env -w GOTOOLCHAIN=go1.24.6+auto +RUN go env -w GOTOOLCHAIN=go1.25.3+auto #Environment variables ENV GOOS=linux GO111MODULE=on GOPROXY=https://proxy.golang.org ENV GOBIN=/gobin GOPATH=/usr/src/go CGO_ENABLED=0 -ENV GOTOOLCHAIN=go1.24.6+auto +ENV GOTOOLCHAIN=go1.25.3+auto # Directory for the binary RUN mkdir /out @@ -38,7 +38,7 @@ RUN chmod -R +x /out FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.24 as dep-builder # Ensure we can use Go 1.24.6 -ENV GOTOOLCHAIN=go1.24.6+auto +ENV GOTOOLCHAIN=go1.25.3+auto ARG GITHUB_URL="https://api.github.com" ARG GITHUB_TOKEN="" diff --git a/Makefile b/Makefile index 9688cb9e..3ded035e 100644 --- a/Makefile +++ b/Makefile @@ -49,13 +49,13 @@ OUTPUT_DIR :=_output CROSS_BUILD_BINDIR :=$(OUTPUT_DIR)/bin build: clean - env -u GOTOOLCHAIN GOTOOLCHAIN=go1.24.6+auto go build -o ocm-backplane ./cmd/ocm-backplane || exit 1 + env -u GOTOOLCHAIN GOTOOLCHAIN=go1.25.3+auto go build -o ocm-backplane ./cmd/ocm-backplane || exit 1 build-static: clean - env -u GOTOOLCHAIN GOTOOLCHAIN=go1.24.6+auto go build -a -installsuffix cgo -ldflags '-extldflags "-static"' -o ocm-backplane ./cmd/ocm-backplane || exit 1 + env -u GOTOOLCHAIN GOTOOLCHAIN=go1.25.3+auto go build -a -installsuffix cgo -ldflags '-extldflags "-static"' -o ocm-backplane ./cmd/ocm-backplane || exit 1 install: - GOTOOLCHAIN=go1.24.6+auto go install ./cmd/ocm-backplane + GOTOOLCHAIN=go1.25.3+auto go install ./cmd/ocm-backplane clean: rm -f ocm-backplane @@ -82,18 +82,18 @@ release-with-note: ensure-goreleaser goreleaser release --rm-dist --release-notes="$(NOTE)" test: - env -u GOTOOLCHAIN GOTOOLCHAIN=go1.24.6+auto go test -v $(TESTOPTS) ./... + env -u GOTOOLCHAIN GOTOOLCHAIN=go1.25.3+auto go test -v $(TESTOPTS) ./... .PHONY: coverage coverage: hack/codecov.sh cross-build-darwin-amd64: - +@GOOS=darwin GOARCH=amd64 GOTOOLCHAIN=go1.24.6+auto go build $(GO_BUILD_FLAGS_DARWIN) -o $(CROSS_BUILD_BINDIR)/ocm-backplane_darwin_amd64 ./cmd/ocm-backplane + +@GOOS=darwin GOARCH=amd64 GOTOOLCHAIN=go1.25.3+auto go build $(GO_BUILD_FLAGS_DARWIN) -o $(CROSS_BUILD_BINDIR)/ocm-backplane_darwin_amd64 ./cmd/ocm-backplane .PHONY: cross-build-darwin-amd64 cross-build-linux-amd64: - +@GOOS=linux GOARCH=amd64 GOTOOLCHAIN=go1.24.6+auto go build $(GO_BUILD_FLAGS_LINUX_CROSS) -o $(CROSS_BUILD_BINDIR)/ocm-backplane_linux_amd64 ./cmd/ocm-backplane + +@GOOS=linux GOARCH=amd64 GOTOOLCHAIN=go1.25.3+auto go build $(GO_BUILD_FLAGS_LINUX_CROSS) -o $(CROSS_BUILD_BINDIR)/ocm-backplane_linux_amd64 ./cmd/ocm-backplane .PHONY: cross-build-linux-amd64 cross-build: cross-build-darwin-amd64 cross-build-linux-amd64 @@ -106,7 +106,7 @@ clean-cross-build: .PHONY: generate generate: - GOTOOLCHAIN=go1.24.6+auto go generate ./... + GOTOOLCHAIN=go1.25.3+auto go generate ./... .PHONY: mock-gen mock-gen: diff --git a/README.md b/README.md index a12d6494..20af99ad 100644 --- a/README.md +++ b/README.md @@ -482,7 +482,7 @@ Wait for the release repository PR to be merged by the CI bot. Update the Go version in the Backplane CLI Dockerfile and verify CI builds: ``` -FROM golang:1.24.6 # Update version to match release PR +FROM golang:1.25.3 # Update version to match release PR ``` Example Implementation: PR [#636](https://github.com/openshift/backplane-cli/pull/636): OSD-28717 Fix build failures Update the dockerfile of backplane-cli with the latest go version and check if build passes. diff --git a/go.mod b/go.mod index dd7dc8bb..1b0d500a 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/openshift/backplane-cli -go 1.24.6 +go 1.24.4 // TODO: Upgrade to 1.24.6 once CI environment supports it require ( github.com/Masterminds/semver v1.5.0 From 1223c8da263812952b178ac3c82b7672cdb0da59 Mon Sep 17 00:00:00 2001 From: MitaliBhalla Date: Mon, 1 Dec 2025 13:43:14 +0530 Subject: [PATCH 7/8] Addressing review commit --- Dockerfile | 6 +++--- Makefile | 14 +++++++------- README.md | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7434dbc5..508f6f30 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,12 +15,12 @@ FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.24 # Configure the env -RUN go env -w GOTOOLCHAIN=go1.25.3+auto +RUN go env -w GOTOOLCHAIN=go1.24.6+auto #Environment variables ENV GOOS=linux GO111MODULE=on GOPROXY=https://proxy.golang.org ENV GOBIN=/gobin GOPATH=/usr/src/go CGO_ENABLED=0 -ENV GOTOOLCHAIN=go1.25.3+auto +ENV GOTOOLCHAIN=go1.24.6+auto # Directory for the binary RUN mkdir /out @@ -38,7 +38,7 @@ RUN chmod -R +x /out FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.24 as dep-builder # Ensure we can use Go 1.24.6 -ENV GOTOOLCHAIN=go1.25.3+auto +ENV GOTOOLCHAIN=go1.24.6+auto ARG GITHUB_URL="https://api.github.com" ARG GITHUB_TOKEN="" diff --git a/Makefile b/Makefile index 3ded035e..9688cb9e 100644 --- a/Makefile +++ b/Makefile @@ -49,13 +49,13 @@ OUTPUT_DIR :=_output CROSS_BUILD_BINDIR :=$(OUTPUT_DIR)/bin build: clean - env -u GOTOOLCHAIN GOTOOLCHAIN=go1.25.3+auto go build -o ocm-backplane ./cmd/ocm-backplane || exit 1 + env -u GOTOOLCHAIN GOTOOLCHAIN=go1.24.6+auto go build -o ocm-backplane ./cmd/ocm-backplane || exit 1 build-static: clean - env -u GOTOOLCHAIN GOTOOLCHAIN=go1.25.3+auto go build -a -installsuffix cgo -ldflags '-extldflags "-static"' -o ocm-backplane ./cmd/ocm-backplane || exit 1 + env -u GOTOOLCHAIN GOTOOLCHAIN=go1.24.6+auto go build -a -installsuffix cgo -ldflags '-extldflags "-static"' -o ocm-backplane ./cmd/ocm-backplane || exit 1 install: - GOTOOLCHAIN=go1.25.3+auto go install ./cmd/ocm-backplane + GOTOOLCHAIN=go1.24.6+auto go install ./cmd/ocm-backplane clean: rm -f ocm-backplane @@ -82,18 +82,18 @@ release-with-note: ensure-goreleaser goreleaser release --rm-dist --release-notes="$(NOTE)" test: - env -u GOTOOLCHAIN GOTOOLCHAIN=go1.25.3+auto go test -v $(TESTOPTS) ./... + env -u GOTOOLCHAIN GOTOOLCHAIN=go1.24.6+auto go test -v $(TESTOPTS) ./... .PHONY: coverage coverage: hack/codecov.sh cross-build-darwin-amd64: - +@GOOS=darwin GOARCH=amd64 GOTOOLCHAIN=go1.25.3+auto go build $(GO_BUILD_FLAGS_DARWIN) -o $(CROSS_BUILD_BINDIR)/ocm-backplane_darwin_amd64 ./cmd/ocm-backplane + +@GOOS=darwin GOARCH=amd64 GOTOOLCHAIN=go1.24.6+auto go build $(GO_BUILD_FLAGS_DARWIN) -o $(CROSS_BUILD_BINDIR)/ocm-backplane_darwin_amd64 ./cmd/ocm-backplane .PHONY: cross-build-darwin-amd64 cross-build-linux-amd64: - +@GOOS=linux GOARCH=amd64 GOTOOLCHAIN=go1.25.3+auto go build $(GO_BUILD_FLAGS_LINUX_CROSS) -o $(CROSS_BUILD_BINDIR)/ocm-backplane_linux_amd64 ./cmd/ocm-backplane + +@GOOS=linux GOARCH=amd64 GOTOOLCHAIN=go1.24.6+auto go build $(GO_BUILD_FLAGS_LINUX_CROSS) -o $(CROSS_BUILD_BINDIR)/ocm-backplane_linux_amd64 ./cmd/ocm-backplane .PHONY: cross-build-linux-amd64 cross-build: cross-build-darwin-amd64 cross-build-linux-amd64 @@ -106,7 +106,7 @@ clean-cross-build: .PHONY: generate generate: - GOTOOLCHAIN=go1.25.3+auto go generate ./... + GOTOOLCHAIN=go1.24.6+auto go generate ./... .PHONY: mock-gen mock-gen: diff --git a/README.md b/README.md index 20af99ad..a12d6494 100644 --- a/README.md +++ b/README.md @@ -482,7 +482,7 @@ Wait for the release repository PR to be merged by the CI bot. Update the Go version in the Backplane CLI Dockerfile and verify CI builds: ``` -FROM golang:1.25.3 # Update version to match release PR +FROM golang:1.24.6 # Update version to match release PR ``` Example Implementation: PR [#636](https://github.com/openshift/backplane-cli/pull/636): OSD-28717 Fix build failures Update the dockerfile of backplane-cli with the latest go version and check if build passes. From 71f35c77efb47776d200711bbb3741fcc3eeb8e3 Mon Sep 17 00:00:00 2001 From: MitaliBhalla Date: Tue, 2 Dec 2025 09:20:44 +0530 Subject: [PATCH 8/8] address review --- .ci-operator.yaml | 6 +++--- Dockerfile | 8 ++++---- Makefile | 14 +++++++------- README.md | 2 +- go.mod | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 460457bf..521c4f16 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: - name: go-toolset - namespace: rhel9 - tag: "1.25" + name: builder + namespace: ocp + tag: rhel-9-golang-1.24-openshift-4.16 diff --git a/Dockerfile b/Dockerfile index 508f6f30..8ff5bf17 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,12 +15,12 @@ FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.24 # Configure the env -RUN go env -w GOTOOLCHAIN=go1.24.6+auto +RUN go env -w GOTOOLCHAIN=go1.24.4+auto #Environment variables ENV GOOS=linux GO111MODULE=on GOPROXY=https://proxy.golang.org ENV GOBIN=/gobin GOPATH=/usr/src/go CGO_ENABLED=0 -ENV GOTOOLCHAIN=go1.24.6+auto +ENV GOTOOLCHAIN=go1.24.4+auto # Directory for the binary RUN mkdir /out @@ -37,8 +37,8 @@ RUN chmod -R +x /out ### Build dependencies FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.24 as dep-builder -# Ensure we can use Go 1.24.6 -ENV GOTOOLCHAIN=go1.24.6+auto +# Ensure we can use Go 1.24.4 +ENV GOTOOLCHAIN=go1.24.4+auto ARG GITHUB_URL="https://api.github.com" ARG GITHUB_TOKEN="" diff --git a/Makefile b/Makefile index 9688cb9e..31ae40f0 100644 --- a/Makefile +++ b/Makefile @@ -49,13 +49,13 @@ OUTPUT_DIR :=_output CROSS_BUILD_BINDIR :=$(OUTPUT_DIR)/bin build: clean - env -u GOTOOLCHAIN GOTOOLCHAIN=go1.24.6+auto go build -o ocm-backplane ./cmd/ocm-backplane || exit 1 + env -u GOTOOLCHAIN GOTOOLCHAIN=go1.24.4+auto go build -o ocm-backplane ./cmd/ocm-backplane || exit 1 build-static: clean - env -u GOTOOLCHAIN GOTOOLCHAIN=go1.24.6+auto go build -a -installsuffix cgo -ldflags '-extldflags "-static"' -o ocm-backplane ./cmd/ocm-backplane || exit 1 + env -u GOTOOLCHAIN GOTOOLCHAIN=go1.24.4+auto go build -a -installsuffix cgo -ldflags '-extldflags "-static"' -o ocm-backplane ./cmd/ocm-backplane || exit 1 install: - GOTOOLCHAIN=go1.24.6+auto go install ./cmd/ocm-backplane + GOTOOLCHAIN=go1.24.4+auto go install ./cmd/ocm-backplane clean: rm -f ocm-backplane @@ -82,18 +82,18 @@ release-with-note: ensure-goreleaser goreleaser release --rm-dist --release-notes="$(NOTE)" test: - env -u GOTOOLCHAIN GOTOOLCHAIN=go1.24.6+auto go test -v $(TESTOPTS) ./... + env -u GOTOOLCHAIN GOTOOLCHAIN=go1.24.4+auto go test -v $(TESTOPTS) ./... .PHONY: coverage coverage: hack/codecov.sh cross-build-darwin-amd64: - +@GOOS=darwin GOARCH=amd64 GOTOOLCHAIN=go1.24.6+auto go build $(GO_BUILD_FLAGS_DARWIN) -o $(CROSS_BUILD_BINDIR)/ocm-backplane_darwin_amd64 ./cmd/ocm-backplane + +@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 .PHONY: cross-build-darwin-amd64 cross-build-linux-amd64: - +@GOOS=linux GOARCH=amd64 GOTOOLCHAIN=go1.24.6+auto go build $(GO_BUILD_FLAGS_LINUX_CROSS) -o $(CROSS_BUILD_BINDIR)/ocm-backplane_linux_amd64 ./cmd/ocm-backplane + +@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 .PHONY: cross-build-linux-amd64 cross-build: cross-build-darwin-amd64 cross-build-linux-amd64 @@ -106,7 +106,7 @@ clean-cross-build: .PHONY: generate generate: - GOTOOLCHAIN=go1.24.6+auto go generate ./... + GOTOOLCHAIN=go1.24.4+auto go generate ./... .PHONY: mock-gen mock-gen: diff --git a/README.md b/README.md index a12d6494..c44bac32 100644 --- a/README.md +++ b/README.md @@ -482,7 +482,7 @@ Wait for the release repository PR to be merged by the CI bot. Update the Go version in the Backplane CLI Dockerfile and verify CI builds: ``` -FROM golang:1.24.6 # Update version to match release PR +FROM golang:1.24.4 # Update version to match release PR ``` Example Implementation: PR [#636](https://github.com/openshift/backplane-cli/pull/636): OSD-28717 Fix build failures Update the dockerfile of backplane-cli with the latest go version and check if build passes. diff --git a/go.mod b/go.mod index 1b0d500a..14436dab 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/openshift/backplane-cli -go 1.24.4 // TODO: Upgrade to 1.24.6 once CI environment supports it +go 1.24.4 require ( github.com/Masterminds/semver v1.5.0