Skip to content

Commit 48d80f6

Browse files
build: remove unnecessary go mod tidy/vendor
Signed-off-by: Niraj Yadav <[email protected]>
1 parent 92ba605 commit 48d80f6

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,7 @@ envtest:
242242
OPERATOR_SDK = $(shell pwd)/bin/operator-sdk
243243
.PHONY: operator-sdk
244244
operator-sdk:
245-
# FIXME: Remove `go mod tidy && go mod vendor` once we find the reason why ci workflow fails.
246-
cd ./tools && go mod tidy && go mod vendor && go build -o $(OPERATOR_SDK) ./vendor/$(shell grep operator-sdk tools/tools.go | sed 's/.*_ "//;s/"//')
245+
cd tools && GOBIN=$$(cd .. && pwd)/bin go install github.com/operator-framework/operator-sdk/cmd/operator-sdk
247246

248247
# protoc-gen-go gets installed from the vendor/ directory.
249248
PROTOC_GEN_GO = $(shell pwd)/bin/protoc-gen-go

tools/go.mod

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ module github.com/csi-addons/kubernetes-csi-addons/tools
22

33
go 1.23.0
44

5-
toolchain go1.24.1
6-
75
require (
86
github.com/operator-framework/operator-sdk v1.38.0
97
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1

tools/tools.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ limitations under the License.
2222
// other dependencies. It also makes things easier to install the tools in
2323
// environments that have slow networking or are completely disconnected.
2424

25-
package main
25+
package tools
2626

2727
import (
2828
_ "github.com/operator-framework/operator-sdk/cmd/operator-sdk"

0 commit comments

Comments
 (0)