diff options
| author | Toon Claes <toon@gitlab.com> | 2021-01-07 20:59:56 +0300 |
|---|---|---|
| committer | Toon Claes <toon@gitlab.com> | 2021-01-07 20:59:56 +0300 |
| commit | 1b2467043dfe265bc4091d2d6e93140d7614898b (patch) | |
| tree | 511cc06d8bc8f1807b74b234f287ba98e3d0038f | |
| parent | c60df396b8c8651d0e5e1c407e6e7de2e824175f (diff) | |
| parent | 688682aa0cafb5cb6d03b575f4b82a60101f530f (diff) | |
Merge branch 'avar/lint-new-from-rev-ci' into 'master'
Lint: add a "lint-strict" CI target
See merge request gitlab-org/gitaly!2978
| -rw-r--r-- | .gitlab-ci.yml | 9 | ||||
| -rw-r--r-- | Makefile | 5 |
2 files changed, 13 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7bd955c2c..6dd413357 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -302,6 +302,15 @@ lint: - go version - make lint +lint-strict: + allow_failure: true + stage: test + retry: 2 + script: + - go version + # b7e24f70b (Add graph from graffle, 2016-11-14) is the root commit + - GOLANGCI_LINT_OPTIONS="--new-from-rev='b7e24f70b71ae8aeb0b6a0d91bf49960e17cb3a3'" make lint + objectinfo_fuzz_test: extends: .fuzz_base stage: test @@ -44,6 +44,9 @@ PROTOC_GEN_GITALY := ${BUILD_DIR}/bin/protoc-gen-gitaly GO_JUNIT_REPORT := ${BUILD_DIR}/bin/go-junit-report GOCOVER_COBERTURA := ${BUILD_DIR}/bin/gocover-cobertura +# Tool options +GOLANGCI_LINT_OPTIONS ?= + # Build information BUNDLE_FLAGS ?= $(shell test -f ${SOURCE_DIR}/../.gdk-install-root && echo --no-deployment || echo --deployment) GITALY_PACKAGE := gitlab.com/gitlab-org/gitaly @@ -259,7 +262,7 @@ check-mod-tidy: .PHONY: lint lint: ${GOLANGCI_LINT} libgit2 - ${Q}${GOLANGCI_LINT} cache clean && ${GOLANGCI_LINT} run --build-tags "${GO_BUILD_TAGS}" --out-format tab --config ${SOURCE_DIR}/.golangci.yml + ${Q}${GOLANGCI_LINT} cache clean && ${GOLANGCI_LINT} run --build-tags "${GO_BUILD_TAGS}" --out-format tab --config ${SOURCE_DIR}/.golangci.yml ${GOLANGCI_LINT_OPTIONS} .PHONY: check-formatting check-formatting: ${GOIMPORTS} ${GITALYFMT} |