Skip to content

Commit 42aedf0

Browse files
Bump Go toolchain to 1.25.3 to fix covdata unit test failure (#2290)
* Bump Go toolchain to 1.25.3 to fix covdata unit test failure Go 1.25.0 has a bug where packages with no test files cause "go: no such tool covdata" errors when run with -coverprofile, resulting in a non-zero exit code from go test. This was fixed in later patch releases. Bumping the toolchain directive ensures CI downloads go1.25.3 instead of using the broken go1.25.0. Co-authored-by: Cursor <cursoragent@cursor.com> * Follow oadp-dev pattern: set go 1.25.0 directive and update submit-coverage The previous toolchain bump alone did not fix the covdata error. Following the oadp-dev branch pattern: - Set go directive to 1.25.0 and remove the toolchain line - Simplify submit-coverage target with --nonZero flag - Add SED = gsed for macOS compatibility The CI config in openshift/release will also need updating to set GOTOOLCHAIN=go1.25.0+auto (matching oadp-dev's CI config). Co-authored-by: Cursor <cursoragent@cursor.com> * bump go to 1.26 Signed-off-by: Wesley Hayutin <weshayutin@gmail.com> --------- Signed-off-by: Wesley Hayutin <weshayutin@gmail.com> Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent 5c79560 commit 42aedf0

4 files changed

Lines changed: 6 additions & 14 deletions

File tree

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM quay.io/konveyor/builder:ubi9-v1.23 AS builder
2+
FROM quay.io/konveyor/builder:ubi9-v1.26 AS builder
33

44
WORKDIR /go/src/github.com/openshift/oadp-operator
55
# Copy the Go Modules manifests

Makefile

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -275,20 +275,14 @@ else
275275
endif
276276
ifeq ($(UNAME_S),Darwin)
277277
OS_String = macos
278+
SED = gsed
278279
endif
279280
endif
280281
submit-coverage:
281282
curl -Os https://uploader.codecov.io/latest/$(OS_String)/codecov
282283
chmod +x codecov
283-
./codecov > tmp.results 2> tmp.err
284-
cat tmp.results || echo "tmp.results not found"
285-
cat tmp.err || echo "tmp.err not found"
286-
@echo $$(cat tmp.results | grep 'resultURL' -c)
287-
@echo $$(cat tmp.err | grep 'please specify sha and slug manually' -c)
288-
if [ $$(cat tmp.err | grep 'please specify sha and slug manually' -c) == 1 ]; then \
289-
echo "specifying sha and slug manually" && ./codecov -C $(shell git rev-parse HEAD) -r openshift/oadp-operator; \
290-
fi
291-
rm -f codecov tmp.*
284+
./codecov -C $(shell git rev-parse HEAD) -r openshift/oadp-operator --nonZero
285+
rm -f codecov
292286

293287
# go-install-tool will 'go install' any package $2 and install it to $1.
294288
PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))

go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/openshift/oadp-operator
22

3-
go 1.23.0
4-
5-
toolchain go1.23.6
3+
go 1.25.0
64

75
require (
86
github.com/aws/aws-sdk-go v1.44.253

konflux.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.24 AS builder
1+
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.26 AS builder
22
COPY . /workspace
33
WORKDIR /workspace
44
ENV GOEXPERIMENT strictfipsruntime

0 commit comments

Comments
 (0)