Skip to content

Commit 42c1fb3

Browse files
authored
re-use super linter script (#1847)
Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>
1 parent cdf4dcf commit 42c1fb3

15 files changed

+16
-76
lines changed

.editorconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ root = true
44
max_line_length = 100
55
indent_size = 2
66

7-
[{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,*.json5}]
7+
[{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}]
88
max_line_length = 200
99

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

1313
[pom.xml]

.github/renovate.json5

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@
1111
],
1212
labels: ["dependencies"],
1313
packageRules: [
14-
{
15-
matchPackageNames: ["jdx/mise"],
16-
groupName: "mise",
17-
schedule: ["before 4am on monday"],
18-
},
1914
{
2015
matchFileNames: ["mise.toml"],
2116
matchDepNames: ["java"],
@@ -28,26 +23,13 @@
2823
groupName: "java graalvm",
2924
additionalBranchPrefix: "graalvm-",
3025
},
31-
{
32-
matchPackageNames: ["/^(ghcr.io/)?super-linter/super-linter$/"],
33-
groupName: "super-linter",
34-
},
3526
],
3627
customManagers: [
3728
{
3829
customType: "regex",
39-
description: "update mise",
40-
managerFilePatterns: ["/(^|/)(workflow-templates|\\.(?:github|gitea|forgejo)/(?:workflows|actions))/.+\\.ya?ml$/", "/(^|/)action\\.ya?ml$/"],
41-
datasourceTemplate: "github-release-attachments",
42-
packageNameTemplate: "jdx/mise",
43-
depNameTemplate: "mise",
44-
matchStrings: ["jdx/mise-action.*\\n\\s*with:\\s*\\n\\s*version: [\"']?(?<currentValue>v[.\\d]+)[\"']?\\s*\\n\\s*sha256: [\"']?(?<currentDigest>\\w+)[\"']?"],
45-
},
46-
{
47-
customType: "regex",
48-
description: "update super-linter in mise tasks",
49-
managerFilePatterns: ["/^\\.mise/tasks/.+\\.sh$/"],
50-
matchStrings: ['# renovate: datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)\\s+\\S+_VERSION="(?<currentValue>v\\d+\\.\\d+\\.\\d+)@(?<currentDigest>sha256:[a-f0-9]+)"'],
30+
description: "Update _VERSION variables in mise.toml",
31+
managerFilePatterns: ["/^mise\\.toml$/"],
32+
matchStrings: ['# renovate: datasource=(?<datasource>[a-z-]+?)(?: depName=(?<depName>.+?))?(?: packageName=(?<packageName>.+?))?(?: versioning=(?<versioning>[a-z-]+?))?\\s.+?_VERSION="?(?<currentValue>[^@"]+?)(?:@(?<currentDigest>sha256:[a-f0-9]+))?"?\\s'],
5133
},
5234
],
5335
}

.github/workflows/acceptance-tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,5 @@ jobs:
1414
persist-credentials: false
1515
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
1616
- uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1
17-
with:
18-
version: v2026.2.0
19-
sha256: 7e1cd2dc33f6ebc9f33c1911013ed92bf724cf63ece21f284aaa4b34987e5002
2017
- name: Run acceptance tests
2118
run: mise run acceptance-test

.github/workflows/build.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ jobs:
1313
with:
1414
persist-credentials: false
1515
- uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1
16-
with:
17-
version: v2026.2.0
18-
sha256: 7e1cd2dc33f6ebc9f33c1911013ed92bf724cf63ece21f284aaa4b34987e5002
1916
- name: Cache local Maven repository
2017
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
2118
with:

.github/workflows/github-pages.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ jobs:
3939
fetch-depth: 0
4040
- uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1
4141
with:
42-
version: v2026.2.0
43-
sha256: 7e1cd2dc33f6ebc9f33c1911013ed92bf724cf63ece21f284aaa4b34987e5002
4442
cache: "false"
4543
- name: Setup Pages
4644
id: pages

.github/workflows/java-version-matrix-tests.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ jobs:
3333

3434
- name: Set up mise
3535
uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1
36-
with:
37-
version: v2026.2.0
38-
sha256: 7e1cd2dc33f6ebc9f33c1911013ed92bf724cf63ece21f284aaa4b34987e5002
3936

4037
- name: Cache local Maven repository
4138
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
@@ -81,4 +78,4 @@ jobs:
8178
TEST_MODULES="it-exporter/it-exporter-test,it-exporter/it-no-protobuf-test,it-pushgateway"
8279
fi
8380
mise exec -- ../mvnw verify -T 2C -Dspotless.skip=true -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn \
84-
-pl $TEST_MODULES
81+
-pl $TEST_MODULES

.github/workflows/lint-rest.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ jobs:
2020
fetch-depth: 0 # needed for merge-base used in lint:links-in-modified-files
2121
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2222
- uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1
23-
with:
24-
version: v2026.2.0
25-
sha256: 7e1cd2dc33f6ebc9f33c1911013ed92bf724cf63ece21f284aaa4b34987e5002
2623

2724
- name: Lint for pull requests
2825
if: github.event_name == 'pull_request'

.github/workflows/native-tests.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ jobs:
1515
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
1616
- uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1
1717
with:
18-
version: v2026.2.0
19-
sha256: 7e1cd2dc33f6ebc9f33c1911013ed92bf724cf63ece21f284aaa4b34987e5002
2018
working_directory: .mise/envs/native
2119
- name: Run native tests
2220
working-directory: .mise/envs/native

.github/workflows/nightly-benchmarks.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@ jobs:
3535

3636
- name: Setup mise
3737
uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1
38-
with:
39-
version: v2026.2.0
40-
sha256: 7e1cd2dc33f6ebc9f33c1911013ed92bf724cf63ece21f284aaa4b34987e5002
4138

4239
- name: Cache local Maven repository
4340
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3

0 commit comments

Comments
 (0)