From 2d61ec0b1da9fff6daaf80b71002b6003546646a Mon Sep 17 00:00:00 2001 From: Ibrahim Serdar Acikgoz Date: Fri, 5 May 2023 16:03:12 +0300 Subject: [PATCH] [MM-52551] Makefile: revert makefile on 067e36c (#23300) * revert make file on 067e36c * Avoid disabling the products * run tests separated only on race tests --------- Co-authored-by: Mattermost Build Co-authored-by: Miguel de la Cruz --- server/Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/server/Makefile b/server/Makefile index 4a893bb70f..00590e7bb3 100644 --- a/server/Makefile +++ b/server/Makefile @@ -132,6 +132,9 @@ DIST_PATH_WIN=$(DIST_ROOT)/windows/mattermost TESTS=. # Packages lists +TE_PACKAGES=$(shell $(GO) list ./... | grep -vE 'server/v8/playbooks|server/v8/boards') +BOARDS_PACKAGES=$(shell $(GO) list ./... | grep -E 'server/v8/boards') +PLAYBOOKS_PACKAGES=$(shell $(GO) list ./... | grep -E 'server/v8/playbooks') SUITE_PACKAGES=$(shell $(GO) list ./...) TEMPLATES_DIR=templates @@ -168,9 +171,9 @@ endif EE_PACKAGES=$(shell $(GO) list $(BUILD_ENTERPRISE_DIR)/...) ifeq ($(BUILD_ENTERPRISE_READY),true) - ALL_PACKAGES=$(SUITE_PACKAGES) $(EE_PACKAGES) + ALL_PACKAGES=$(TE_PACKAGES) $(BOARDS_PACKAGES) $(PLAYBOOKS_PACKAGES) $(EE_PACKAGES) else - ALL_PACKAGES=$(SUITE_PACKAGES) + ALL_PACKAGES=$(TE_PACKAGES) $(BOARDS_PACKAGES) $(PLAYBOOKS_PACKAGES) endif all: run ## Alias for 'run'. @@ -453,7 +456,9 @@ else endif test-server-race: test-server-pre - ./scripts/test.sh "$(GO)" "-race $(GOFLAGS)" "$(SUITE_PACKAGES) $(EE_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)" "90m" "atomic" + ./scripts/test.sh "$(GO)" "-race $(GOFLAGS)" "$(TE_PACKAGES) $(EE_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)" "90m" "atomic" + ./scripts/test.sh "$(GO)" "-race $(GOFLAGS)" "$(BOARDS_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)" "90m" "atomic" + ./scripts/test.sh "$(GO)" "-race $(GOFLAGS)" "$(PLAYBOOKS_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)" "90m" "atomic" ifneq ($(IS_CI),true) ifneq ($(MM_NO_DOCKER),true) ifneq ($(TEMP_DOCKER_SERVICES),)