Skip to content

Commit

Permalink
build: remove unneeded go mod tidy && go mod vendor
Browse files Browse the repository at this point in the history
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: csi-addons#384
Signed-off-by: Niels de Vos <[email protected]>
  • Loading branch information
nixpanic authored and Madhu-1 committed Nov 9, 2023
1 parent 3be3bf9 commit ad5f740
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down

0 comments on commit ad5f740

Please sign in to comment.