From ad5f740ce21f8cd75c53e0c2d3d5284f59eb63af Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Wed, 28 Jun 2023 13:53:13 +0200 Subject: [PATCH] build: remove unneeded `go mod tidy && go mod vendor` There has been a bad proxy somewhere that caused issues downloading or verfying the github.com/operator-framework/operator-sdk module. Things have recovered now, so the extra tidy/vendor commands are not needed anymore. Closes: #384 Signed-off-by: Niels de Vos --- Makefile | 3 +-- tools/go.sum | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b97caa016..eb529b994 100644 --- a/Makefile +++ b/Makefile @@ -248,8 +248,7 @@ envtest: OPERATOR_SDK = $(shell pwd)/bin/operator-sdk .PHONY: operator-sdk operator-sdk: -# FIXME: Remove `go mod tidy && go mod vendor` once we find the reason why ci workflow fails. - cd ./tools && go mod tidy && go mod vendor && go build -o $(OPERATOR_SDK) ./vendor/$(shell grep operator-sdk tools/tools.go | sed 's/.*_ "//;s/"//') + cd ./tools && go build -o $(OPERATOR_SDK) ./vendor/$(shell grep operator-sdk tools/tools.go | sed 's/.*_ "//;s/"//') # protoc-gen-go gets installed from the vendor/ directory. PROTOC_GEN_GO = $(shell pwd)/bin/protoc-gen-go diff --git a/tools/go.sum b/tools/go.sum index 4d573a6c6..a86c62c9b 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -1001,7 +1001,7 @@ github.com/operator-framework/operator-manifest-tools v0.2.3-0.20230227155221-ca github.com/operator-framework/operator-manifest-tools v0.2.3-0.20230227155221-caa8b9e1ab12/go.mod h1:5OAMYmIkFCiiHfS1r3HcIYu3F/sum38pofSoLZy7Cbw= github.com/operator-framework/operator-registry v1.26.5-0.20230307160312-3bfcb23fa7d0 h1:TMYB8U+0F5MJJ6x6CGnri0bH/ea/wvJZ9dZzT5salfo= github.com/operator-framework/operator-registry v1.26.5-0.20230307160312-3bfcb23fa7d0/go.mod h1:ChLO6+eQ6RMeVJ0K9DlJPjeP4iX+T5BwdxVYzuOdcMc= -github.com/operator-framework/operator-sdk v1.29.0 h1:fHHJd6JkIUWMtQCGfokLZBWYBV7xqFv3JHNSRZzNnjQ= +github.com/operator-framework/operator-sdk v1.29.0 h1:ZUwkRxMTngafaBtIi8WYEOv2WiI4FsG2UMzKSEgEPPg= github.com/operator-framework/operator-sdk v1.29.0/go.mod h1:QO8gE736UilYLC61lOsUJYc190x2PCgW5TD13DBgONg= github.com/otiai10/copy v1.2.0 h1:HvG945u96iNadPoG2/Ja2+AUJeW5YuFQMixq9yirC+k= github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw=