diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2fbe84c81d..6eece82e46 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -58,22 +58,6 @@ jobs: - name: test bindata/scripts run: make test-bindata-scripts - modules: - name: check go modules - runs-on: ubuntu-latest - steps: - - - name: Set up Go 1.22 - uses: actions/setup-go@v2 - with: - go-version: 1.22.x - - - name: Check out code into the Go module directory - uses: actions/checkout@v2 - - - name: check go modules are up to date - run: make check-deps - manifests: name: check manifests runs-on: ubuntu-latest diff --git a/Makefile b/Makefile index 9f3105f52b..fabceb519c 100644 --- a/Makefile +++ b/Makefile @@ -249,14 +249,7 @@ undeploy-k8s: export OPERATOR_EXEC=kubectl undeploy-k8s: undeploy deps-update: - go mod tidy && \ - go mod vendor - -check-deps: deps-update - @set +e; git diff --quiet HEAD go.sum go.mod vendor; \ - if [ $$? -eq 1 ]; \ - then echo -e "\ngo modules are out of date. Please commit after running 'make deps-update' command\n"; \ - exit 1; fi + go mod tidy $(GOLANGCI_LINT): ; $(info installing golangci-lint...) $(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VER))