From 02db583d116e87fd1e57ed9f4c4fc23595bbb613 Mon Sep 17 00:00:00 2001 From: Trevor Whitney Date: Thu, 10 Oct 2024 09:23:30 -0600 Subject: [PATCH] ci: speciy golangci-lint build tags at runtime --- .golangci.yml | 2 -- Makefile | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 9a3e34b7754bf..0618237e0d024 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -20,9 +20,7 @@ run: # list of build tags, all linters use it. Default is empty list. build-tags: - - linux - cgo - - promtail_journal_enabled - integration # output configuration options diff --git a/Makefile b/Makefile index 609a8190f00a4..c5afc7b669d64 100644 --- a/Makefile +++ b/Makefile @@ -339,7 +339,7 @@ ifeq ($(BUILD_IN_CONTAINER),true) else go version golangci-lint version - GO111MODULE=on golangci-lint run -v --timeout 15m + GO111MODULE=on golangci-lint run -v --timeout 15m --build-tags linux,promtail_journal_enabled faillint -paths "sync/atomic=go.uber.org/atomic" ./... endif