ci: speciy golangci-lint build tags at runtime (#14456)

grafana · Oct 10, 2024 · b8f17ab · b8f17ab
1 parent 242a852
commit b8f17ab
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 11 deletions.
diff --git a/.github/jsonnetfile.json b/.github/jsonnetfile.json
@@ -8,7 +8,7 @@
           "subdir": "workflows"
         }
       },
-      "version": "d900569c04b53e02de6ef208fa77cba41ec5f709"
+      "version": "20aac53fcb06d378b1c1101c7e4dc989466eb4ff"
     }
   ],
   "legacyImports": true

diff --git a/.github/jsonnetfile.lock.json b/.github/jsonnetfile.lock.json
@@ -8,8 +8,8 @@
           "subdir": "workflows"
         }
       },
-      "version": "d900569c04b53e02de6ef208fa77cba41ec5f709",
-      "sum": "+uAzU+b+aJtp3k+JX5mDxuh8LNY23+cHvUOwzCQ8CS8="
+      "version": "20aac53fcb06d378b1c1101c7e4dc989466eb4ff",
+      "sum": "bo355Fm9Gm1TU13MjlXGXgrCXo4CPr7aEeTvgNFYAl8="
     }
   ],
   "legacyImports": false

diff --git a/.github/vendor/github.com/grafana/loki-release/workflows/validate.libsonnet b/.github/vendor/github.com/grafana/loki-release/workflows/validate.libsonnet
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -12,4 +12,4 @@
   "pull_request": {}
   "push":
     "branches":
-    - "main"
+    - "main"
diff --git a/.github/workflows/images.yml b/.github/workflows/images.yml
@@ -430,4 +430,4 @@
 "permissions":
   "contents": "write"
   "id-token": "write"
-  "pull-requests": "write"
+  "pull-requests": "write"
diff --git a/.github/workflows/minor-release-pr.yml b/.github/workflows/minor-release-pr.yml
@@ -828,4 +828,4 @@ name: "Prepare Minor Release PR from Weekly"
 permissions:
   contents: "write"
   id-token: "write"
-  pull-requests: "write"
+  pull-requests: "write"
diff --git a/.github/workflows/patch-release-pr.yml b/.github/workflows/patch-release-pr.yml
@@ -828,4 +828,4 @@ name: "Prepare Patch Release PR"
 permissions:
   contents: "write"
   id-token: "write"
-  pull-requests: "write"
+  pull-requests: "write"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -219,4 +219,4 @@ name: "create release"
 permissions:
   contents: "write"
   id-token: "write"
-  pull-requests: "write"
+  pull-requests: "write"
diff --git 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
@@ -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