Skip to content

Commit e0647bd

Browse files
authored
chore: update flint to 0.21.0 (#2045)
Updates the flint binary pin to v0.20.4 and reruns `flint init -y` so the generated lint workflow and linter config match the current release. Validation: - `flint init -y` - `flint init -y` again for idempotence - `git diff --check` --------- Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>
1 parent 76c3e0c commit e0647bd

44 files changed

Lines changed: 163 additions & 239 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.editorconfig

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ indent_size = 2
77
[{version-rules.xml,maven-wrapper.properties,checkstyle.xml,docker-compose.yaml,docker-compose.yml,Dockerfile,example_target_info.json,mise.toml,mvnm,mvnw.cmd,generate-protobuf.sh,.gitleaksignore,prometheus.properties}]
88
max_line_length = 200
99

10-
[{grafana-dashboard-*.json,.editorconfig,super-linter.env,lychee.toml,renovate.json5,CODE_OF_CONDUCT.md}]
10+
[{grafana-dashboard-*.json,.editorconfig,lychee.toml,renovate.json5,CODE_OF_CONDUCT.md}]
1111
max_line_length = 300
1212

1313
[pom.xml]
@@ -20,3 +20,11 @@ max_line_length = 120
2020

2121
[{.mise/tasks/build-release.sh,.github/workflows/*.yml}]
2222
max_line_length = 300
23+
24+
[*.java]
25+
# Java line length is handled by google-java-format
26+
max_line_length = off
27+
28+
[*.md]
29+
# Markdown line length is handled by rumdl
30+
max_line_length = off

.github/config/.editorconfig-checker.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

.github/config/.rumdl.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[MD013]
2+
enabled = true
3+
line-length = 120
4+
code-blocks = false
5+
tables = false

.github/config/.taplo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[formatting]
2+
column_width = 120
3+
indent_string = " "

.github/config/.yamllint.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
extends: relaxed
2+
3+
rules:
4+
document-start: disable
5+
# Line length is owned by the repo's root .editorconfig.
6+
line-length: disable
7+
# Keep indentation checks in yamllint so YAML structure issues still fail lint.
8+
indentation: enable

.github/config/flint.toml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
[settings]
22
# These paths are generated, vendored, or handled by other checks.
3-
exclude = [
4-
"CHANGELOG.md",
5-
"**/src/main/generated/**",
6-
"docs/themes/**",
7-
"mvnw",
8-
"simpleclient-archive/**",
9-
]
3+
exclude = ["CHANGELOG.md", "**/src/main/generated/**", "docs/themes/**", "mvnw", "simpleclient-archive/**"]
4+
setup_migration_version = 2
105

116
[checks.renovate-deps]
12-
# This inventory is regenerated from the files flint still inspects, so
13-
# super-linter-era entries drop out when they are excluded or no longer used.
147
exclude_managers = ["github-actions", "github-runners", "maven"]

.github/config/super-linter.env

Lines changed: 0 additions & 24 deletions
This file was deleted.

.github/renovate-tracked-deps.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,24 +67,25 @@
6767
"mise.toml": {
6868
"mise": [
6969
"actionlint",
70-
"cargo:xmloxide",
70+
"aqua:owenlamont/ryl",
71+
"biome",
7172
"editorconfig-checker",
7273
"github:google/google-java-format",
7374
"github:grafana/flint",
75+
"github:jonwiggins/xmloxide",
76+
"github:koalaman/shellcheck",
7477
"go:github.com/gohugoio/hugo",
7578
"go:github.com/grafana/oats",
7679
"java",
7780
"lychee",
7881
"node",
79-
"npm:@biomejs/biome",
80-
"npm:markdownlint-cli2",
81-
"npm:prettier",
8282
"npm:renovate",
8383
"pipx:codespell",
84-
"pipx:ruff",
8584
"protoc",
86-
"shellcheck",
87-
"shfmt"
85+
"ruff",
86+
"rumdl",
87+
"shfmt",
88+
"taplo"
8889
]
8990
},
9091
"mvnw": {

.github/renovate.json5

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
$schema: "https://docs.renovatebot.com/renovate-schema.json",
3-
extends: ["config:best-practices", "config:recommended", "github>grafana/flint#v0.20.3"],
3+
extends: ["config:best-practices", "config:recommended", "github>grafana/flint#v0.21.0"],
44
platformCommit: "enabled",
55
automerge: true,
66
ignorePaths: [

.github/workflows/lint.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ jobs:
2929
- name: Lint
3030
env:
3131
GITHUB_TOKEN: ${{ github.token }}
32-
GITHUB_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
32+
GITHUB_REPOSITORY: ${{ github.repository }}
33+
GITHUB_BASE_REF: ${{ github.base_ref }}
34+
GITHUB_HEAD_REF: ${{ github.head_ref }}
3335
PR_HEAD_REPO: ${{ github.event.pull_request.head.repo.full_name }}
3436
run: mise run lint

0 commit comments

Comments
 (0)