From 6bad385164f8ec09ae1d87a36cb2ed8910da8420 Mon Sep 17 00:00:00 2001 From: Ibrahim Serdar Acikgoz Date: Tue, 10 May 2022 11:29:51 +0300 Subject: [PATCH] update make update dependencies rule (#20157) --- Makefile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 8a4d562376..c3e69ef8b6 100644 --- a/Makefile +++ b/Makefile @@ -619,17 +619,20 @@ setup-mac: ## Adds macOS hosts entries for Docker. update-dependencies: ## Uses go get -u to update all the dependencies while holding back any that require it. @echo Updating Dependencies +ifeq ($(BUILD_ENTERPRISE_READY),true) + @echo Enterprise repository detected, temporarily removing imports.go + rm -f imports/imports.go +endif + # Update all dependencies (does not update across major versions) $(GO) get -u ./... # Tidy up $(GO) mod tidy - # Copy everything to vendor directory - # $(GO) mod vendor - - # Tidy up - $(GO) mod tidy +ifeq ($(BUILD_ENTERPRISE_READY),true) + cp $(BUILD_ENTERPRISE_DIR)/imports/imports.go imports/ +endif vet: ## Run mattermost go vet specific checks $(GO) install github.com/mattermost/mattermost-govet/v2@new