From 236716f9c70c18c5fea8b775e088bc7a3eb46941 Mon Sep 17 00:00:00 2001 From: Mustafa Kara Date: Fri, 5 Aug 2022 12:49:45 +0300 Subject: [PATCH] Stop applying server lint rules to focalbard repo. (#20772) * Stop applying server lint rules to focalbard repo. * Remove board packages from the tests. Signed-off-by: Mustafa Kara Co-authored-by: Mattermod --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8166fa88b6..d005e85722 100644 --- a/Makefile +++ b/Makefile @@ -184,7 +184,10 @@ endif # Prepare optional Boards build. BOARDS_PACKAGES=$(shell $(GO) list $(BUILD_BOARDS_DIR)/server/...) ifeq ($(BUILD_BOARDS),true) - ALL_PACKAGES += $(BOARDS_PACKAGES) +# We removed `ALL_PACKAGES += $(BOARDS_PACKAGES)` since board tests needs `-tag 'json1'` in the tests. +# Adding that flag to server breaks the build with unsupported flag error. +# PR: https://github.com/mattermost/mattermost-server/pull/20772 +# Ticket: https://mattermost.atlassian.net/browse/CLD-3800 IGNORE:=$(shell echo Boards build selected, preparing) IGNORE:=$(shell rm -f imports/boards_imports.go) IGNORE:=$(shell cp $(BUILD_BOARDS_DIR)/mattermost-plugin/product/imports/boards_imports.go imports/) @@ -317,7 +320,7 @@ ifeq ($(BUILD_ENTERPRISE_READY),true) endif ifeq ($(BUILD_BOARDS),true) ifneq ($(MM_NO_BOARDS_LINT),true) - $(GOBIN)/golangci-lint run $(BUILD_BOARDS_DIR)/server/... + cd $(BUILD_BOARDS_DIR); make server-lint endif endif