* Don't lint EE code in TE CI

* Fix typo
Этот коммит содержится в:
Ben Schumacher
2020-01-07 12:37:57 +01:00
коммит произвёл Jesús Espino
родитель 092e53ace2
Коммит 81efef7b5a
3 изменённых файлов: 6 добавлений и 2 удалений

Просмотреть файл

@@ -69,7 +69,7 @@ jobs:
GO111MODULE=off go get -u github.com/mattermost/mattermost-govet GO111MODULE=off go get -u github.com/mattermost/mattermost-govet
cd mattermost-server cd mattermost-server
make config-reset make config-reset
make check-style BUILD_NUMBER='${CIRCLE_BRANCH}-${CIRCLE_BUILD_NUM}' make check-style BUILD_NUMBER='${CIRCLE_BRANCH}-${CIRCLE_BUILD_NUM}' MM_NO_ENTERPRISE_LINT=true
make build BUILD_NUMBER='${CIRCLE_BRANCH}-${CIRCLE_BUILD_NUM}' make build BUILD_NUMBER='${CIRCLE_BRANCH}-${CIRCLE_BUILD_NUM}'
make package BUILD_NUMBER='${CIRCLE_BRANCH}-${CIRCLE_BUILD_NUM}' make package BUILD_NUMBER='${CIRCLE_BRANCH}-${CIRCLE_BUILD_NUM}'
- store_artifacts: - store_artifacts:

Просмотреть файл

@@ -161,8 +161,10 @@ golangci-lint: ## Run golangci-lint on codebase
@echo Running golangci-lint @echo Running golangci-lint
golangci-lint run ./... golangci-lint run ./...
ifeq ($(BUILD_ENTERPRISE_READY),true) ifeq ($(BUILD_ENTERPRISE_READY),true)
ifneq ($(MM_NO_ENTERPRISE_LINT),true)
golangci-lint run ./enterprise/... golangci-lint run ./enterprise/...
endif endif
endif
i18n-extract: ## Extract strings for translation from the source code i18n-extract: ## Extract strings for translation from the source code
env GO111MODULE=off $(GO) get -u github.com/mattermost/mattermost-utilities/mmgotool env GO111MODULE=off $(GO) get -u github.com/mattermost/mattermost-utilities/mmgotool
@@ -456,8 +458,10 @@ vet: ## Run mattermost go vet specific checks
$(GO) vet -vettool=$(GOPATH)/bin/mattermost-govet -license -structuredLogging ./... $(GO) vet -vettool=$(GOPATH)/bin/mattermost-govet -license -structuredLogging ./...
ifeq ($(BUILD_ENTERPRISE_READY),true) ifeq ($(BUILD_ENTERPRISE_READY),true)
ifneq ($(MM_NO_ENTERPRISE_LINT),true)
$(GO) vet -vettool=$(GOPATH)/bin/mattermost-govet -enterpriseLicense -structuredLogging ./enterprise/... $(GO) vet -vettool=$(GOPATH)/bin/mattermost-govet -enterpriseLicense -structuredLogging ./enterprise/...
endif endif
endif
todo: ## Display TODO and FIXME items in the source code. todo: ## Display TODO and FIXME items in the source code.
@! ag --ignore Makefile --ignore-dir vendor --ignore-dir runtime TODO @! ag --ignore Makefile --ignore-dir vendor --ignore-dir runtime TODO

Просмотреть файл

@@ -105,7 +105,7 @@ pipeline {
echo "Installing mattermost-govet" echo "Installing mattermost-govet"
GO111MODULE=off go get -u github.com/mattermost/mattermost-govet GO111MODULE=off go get -u github.com/mattermost/mattermost-govet
make config-reset make config-reset
make check-style BUILD_NUMBER='${BRANCH_NAME}-${BUILD_NUMBER}' make check-style BUILD_NUMBER='${BRANCH_NAME}-${BUILD_NUMBER}' MM_NO_ENTERPRISE_LINT=true
make build BUILD_NUMBER='${BRANCH_NAME}-${BUILD_NUMBER}' make build BUILD_NUMBER='${BRANCH_NAME}-${BUILD_NUMBER}'
make package BUILD_NUMBER='${BRANCH_NAME}-${BUILD_NUMBER}' make package BUILD_NUMBER='${BRANCH_NAME}-${BUILD_NUMBER}'
""" """