Skip to content

build: remove unnecessary go mod tidy/vendor #795

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,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 && GOBIN=$$(cd .. && pwd)/bin go install github.com/operator-framework/operator-sdk/cmd/operator-sdk

# protoc-gen-go gets installed from the vendor/ directory.
PROTOC_GEN_GO = $(shell pwd)/bin/protoc-gen-go
Expand Down
2 changes: 0 additions & 2 deletions tools/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ module github.com/csi-addons/kubernetes-csi-addons/tools

go 1.23.0

toolchain go1.24.1

require (
github.com/operator-framework/operator-sdk v1.38.0
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1
Expand Down
2 changes: 1 addition & 1 deletion tools/tools.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ limitations under the License.
// other dependencies. It also makes things easier to install the tools in
// environments that have slow networking or are completely disconnected.

package main
package tools

import (
_ "github.com/operator-framework/operator-sdk/cmd/operator-sdk"
Expand Down
Loading