From c13ed85c41fdc05e44f7e3c72d96e390abe133df Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Thu, 2 Jul 2020 09:10:16 +0200 Subject: [PATCH] Drone: Fix Go linting Signed-off-by: Arve Knudsen --- .drone.star | 16 +--------------- .drone.yml | 8 +------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/.drone.star b/.drone.star index 54c60b5ba60..15780a6f28c 100644 --- a/.drone.star +++ b/.drone.star @@ -94,21 +94,7 @@ def pipeline_set(kind, name): 'install-deps', ], 'commands': [ - 'make scripts/go/bin/revive scripts/go/bin/gosec', - 'go vet ./pkg/...', - 'golangci-lint run -v --config scripts/go/configs/ci/.golangci.yml -E deadcode ' + - '-E gofmt -E gosimple -E ineffassign -E structcheck -E typecheck ./pkg/...', - 'golangci-lint run -v --config scripts/go/configs/ci/.golangci.yml -E unconvert -E unused ' + - '-E varcheck -E goconst -E errcheck -E staticcheck ./pkg/...', - './scripts/go/bin/revive -formatter stylish -config ./scripts/go/configs/revive.toml ./pkg/...', - './scripts/go/bin/revive -formatter stylish -config ./scripts/go/configs/revive-strict.toml ' + - '-exclude ./pkg/plugins/backendplugin/pluginextensionv2/... ' + - './pkg/services/alerting/... ' + - './pkg/services/provisioning/datasources/... ' + - './pkg/services/provisioning/dashboards/... ' + - './pkg/plugins/backendplugin/...', - './scripts/go/bin/gosec -quiet -exclude=G104,G107,G108,G201,G202,G204,G301,G304,G401,G402,G501 ' + - '-conf=./scripts/go/configs/gosec.json ./pkg/...', + 'make lint-go', ], }, { diff --git a/.drone.yml b/.drone.yml index 69385682c83..2afaf39cd10 100644 --- a/.drone.yml +++ b/.drone.yml @@ -27,13 +27,7 @@ steps: - name: lint-go image: grafana/build-container:1.2.21 commands: - - make scripts/go/bin/revive scripts/go/bin/gosec - - go vet ./pkg/... - - golangci-lint run -v --config scripts/go/configs/ci/.golangci.yml -E deadcode -E gofmt -E gosimple -E ineffassign -E structcheck -E typecheck ./pkg/... - - golangci-lint run -v --config scripts/go/configs/ci/.golangci.yml -E unconvert -E unused -E varcheck -E goconst -E errcheck -E staticcheck ./pkg/... - - ./scripts/go/bin/revive -formatter stylish -config ./scripts/go/configs/revive.toml ./pkg/... - - ./scripts/go/bin/revive -formatter stylish -config ./scripts/go/configs/revive-strict.toml -exclude ./pkg/plugins/backendplugin/pluginextensionv2/... ./pkg/services/alerting/... ./pkg/services/provisioning/datasources/... ./pkg/services/provisioning/dashboards/... ./pkg/plugins/backendplugin/... - - ./scripts/go/bin/gosec -quiet -exclude=G104,G107,G108,G201,G202,G204,G301,G304,G401,G402,G501 -conf=./scripts/go/configs/gosec.json ./pkg/... + - make lint-go environment: CGO_ENABLED: 1 depends_on: