diff --git a/.editorconfig b/.editorconfig index 355cca83e..1cf9052df 100644 --- a/.editorconfig +++ b/.editorconfig @@ -4,10 +4,10 @@ root = true max_line_length = 100 indent_size = 2 -[{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}] +[{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}] max_line_length = 200 -[{grafana-dashboard-*.json,.editorconfig,super-linter.env}] +[{grafana-dashboard-*.json,.editorconfig,super-linter.env,renovate.json5}] max_line_length = 300 [pom.xml] diff --git a/.github/super-linter.env b/.github/config/super-linter.env similarity index 100% rename from .github/super-linter.env rename to .github/config/super-linter.env diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 20a6be197..bcf6643d1 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -11,11 +11,6 @@ ], labels: ["dependencies"], packageRules: [ - { - matchPackageNames: ["jdx/mise"], - groupName: "mise", - schedule: ["before 4am on monday"], - }, { matchFileNames: ["mise.toml"], matchDepNames: ["java"], @@ -28,26 +23,13 @@ groupName: "java graalvm", additionalBranchPrefix: "graalvm-", }, - { - matchPackageNames: ["/^(ghcr.io/)?super-linter/super-linter$/"], - groupName: "super-linter", - }, ], customManagers: [ { customType: "regex", - description: "update mise", - managerFilePatterns: ["/(^|/)(workflow-templates|\\.(?:github|gitea|forgejo)/(?:workflows|actions))/.+\\.ya?ml$/", "/(^|/)action\\.ya?ml$/"], - datasourceTemplate: "github-release-attachments", - packageNameTemplate: "jdx/mise", - depNameTemplate: "mise", - matchStrings: ["jdx/mise-action.*\\n\\s*with:\\s*\\n\\s*version: [\"']?(?v[.\\d]+)[\"']?\\s*\\n\\s*sha256: [\"']?(?\\w+)[\"']?"], - }, - { - customType: "regex", - description: "update super-linter in mise tasks", - managerFilePatterns: ["/^\\.mise/tasks/.+\\.sh$/"], - matchStrings: ['# renovate: datasource=(?\\S+) depName=(?\\S+)\\s+\\S+_VERSION="(?v\\d+\\.\\d+\\.\\d+)@(?sha256:[a-f0-9]+)"'], + description: "Update _VERSION variables in mise.toml", + managerFilePatterns: ["/^mise\\.toml$/"], + matchStrings: ['# renovate: datasource=(?[a-z-]+?)(?: depName=(?.+?))?(?: packageName=(?.+?))?(?: versioning=(?[a-z-]+?))?\\s.+?_VERSION="?(?[^@"]+?)(?:@(?sha256:[a-f0-9]+))?"?\\s'], }, ], } diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml index 3c7bf414e..977973f3b 100644 --- a/.github/workflows/acceptance-tests.yml +++ b/.github/workflows/acceptance-tests.yml @@ -14,8 +14,5 @@ jobs: persist-credentials: false uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 - uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1 - with: - version: v2026.2.0 - sha256: 7e1cd2dc33f6ebc9f33c1911013ed92bf724cf63ece21f284aaa4b34987e5002 - name: Run acceptance tests run: mise run acceptance-test diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b8cf9ecaf..e5b1980e8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,9 +13,6 @@ jobs: with: persist-credentials: false - uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1 - with: - version: v2026.2.0 - sha256: 7e1cd2dc33f6ebc9f33c1911013ed92bf724cf63ece21f284aaa4b34987e5002 - name: Cache local Maven repository uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3 with: diff --git a/.github/workflows/github-pages.yaml b/.github/workflows/github-pages.yaml index e0582dd24..37cc39f37 100644 --- a/.github/workflows/github-pages.yaml +++ b/.github/workflows/github-pages.yaml @@ -39,8 +39,6 @@ jobs: fetch-depth: 0 - uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1 with: - version: v2026.2.0 - sha256: 7e1cd2dc33f6ebc9f33c1911013ed92bf724cf63ece21f284aaa4b34987e5002 cache: "false" - name: Setup Pages id: pages diff --git a/.github/workflows/java-version-matrix-tests.yml b/.github/workflows/java-version-matrix-tests.yml index 93099d3c5..d476e7bb7 100644 --- a/.github/workflows/java-version-matrix-tests.yml +++ b/.github/workflows/java-version-matrix-tests.yml @@ -33,9 +33,6 @@ jobs: - name: Set up mise uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1 - with: - version: v2026.2.0 - sha256: 7e1cd2dc33f6ebc9f33c1911013ed92bf724cf63ece21f284aaa4b34987e5002 - name: Cache local Maven repository uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3 @@ -81,4 +78,4 @@ jobs: TEST_MODULES="it-exporter/it-exporter-test,it-exporter/it-no-protobuf-test,it-pushgateway" fi mise exec -- ../mvnw verify -T 2C -Dspotless.skip=true -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn \ - -pl $TEST_MODULES \ No newline at end of file + -pl $TEST_MODULES diff --git a/.github/workflows/lint-rest.yml b/.github/workflows/lint-rest.yml index 236fac334..4ae5b0f5a 100644 --- a/.github/workflows/lint-rest.yml +++ b/.github/workflows/lint-rest.yml @@ -20,9 +20,6 @@ jobs: fetch-depth: 0 # needed for merge-base used in lint:links-in-modified-files uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1 - with: - version: v2026.2.0 - sha256: 7e1cd2dc33f6ebc9f33c1911013ed92bf724cf63ece21f284aaa4b34987e5002 - name: Lint for pull requests if: github.event_name == 'pull_request' diff --git a/.github/workflows/native-tests.yml b/.github/workflows/native-tests.yml index e773230a4..b93edab06 100644 --- a/.github/workflows/native-tests.yml +++ b/.github/workflows/native-tests.yml @@ -15,8 +15,6 @@ jobs: uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 - uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1 with: - version: v2026.2.0 - sha256: 7e1cd2dc33f6ebc9f33c1911013ed92bf724cf63ece21f284aaa4b34987e5002 working_directory: .mise/envs/native - name: Run native tests working-directory: .mise/envs/native diff --git a/.github/workflows/nightly-benchmarks.yml b/.github/workflows/nightly-benchmarks.yml index 7c7eb960b..4ee4adbc5 100644 --- a/.github/workflows/nightly-benchmarks.yml +++ b/.github/workflows/nightly-benchmarks.yml @@ -35,9 +35,6 @@ jobs: - name: Setup mise uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1 - with: - version: v2026.2.0 - sha256: 7e1cd2dc33f6ebc9f33c1911013ed92bf724cf63ece21f284aaa4b34987e5002 - name: Cache local Maven repository uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 551b323ea..e950b4b36 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,8 +26,6 @@ jobs: - uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1 with: - version: v2026.2.0 - sha256: 7e1cd2dc33f6ebc9f33c1911013ed92bf724cf63ece21f284aaa4b34987e5002 cache: false - name: Build release version diff --git a/.github/workflows/super-linter.yml b/.github/workflows/super-linter.yml index 9ea584d5a..332221bf7 100644 --- a/.github/workflows/super-linter.yml +++ b/.github/workflows/super-linter.yml @@ -9,9 +9,6 @@ jobs: permissions: contents: read - packages: read - # To report GitHub Actions status checks - statuses: write steps: - name: Checkout code @@ -20,11 +17,7 @@ jobs: persist-credentials: false fetch-depth: 0 - - name: Load super-linter configuration - run: grep -v '^#' .github/super-linter.env | grep -v 'FIX_' >> "$GITHUB_ENV" + - uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1 - name: Super-linter - uses: super-linter/super-linter@12562e48d7059cf666c43a4ecb0d3b5a2b31bd9e # v8.4.0 - env: - # To report GitHub Actions status checks - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: mise run lint:super-linter --no-fix diff --git a/.github/workflows/test-release-build.yml b/.github/workflows/test-release-build.yml index db2f80058..a74864ecc 100644 --- a/.github/workflows/test-release-build.yml +++ b/.github/workflows/test-release-build.yml @@ -17,9 +17,6 @@ jobs: with: persist-credentials: false - uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1 - with: - version: v2026.2.0 - sha256: 7e1cd2dc33f6ebc9f33c1911013ed92bf724cf63ece21f284aaa4b34987e5002 - name: Cache local Maven repository uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3 with: diff --git a/.mise/tasks/lint/super-linter.sh b/.mise/tasks/lint/super-linter.sh deleted file mode 100755 index dbaa4df04..000000000 --- a/.mise/tasks/lint/super-linter.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -#MISE description="Run GitHub Super Linter on the repository" - -set -euo pipefail - -# renovate: datasource=docker depName=ghcr.io/super-linter/super-linter -SUPER_LINTER_VERSION="v8.4.0@sha256:c5e3307932203ff9e1e8acfe7e92e894add6266605b5d7fb525fb371a59a26f4" - -# Super-linter doesn't publish ARM64 images, so always use amd64 -docker pull --platform linux/amd64 "ghcr.io/super-linter/super-linter:${SUPER_LINTER_VERSION}" - -docker run --rm \ - --platform linux/amd64 \ - -e RUN_LOCAL=true \ - -e DEFAULT_BRANCH=main \ - --env-file ".github/super-linter.env" \ - -v "$(pwd)":/tmp/lint \ - "ghcr.io/super-linter/super-linter:${SUPER_LINTER_VERSION}" diff --git a/mise.toml b/mise.toml index 64e60b2bb..267937d05 100644 --- a/mise.toml +++ b/mise.toml @@ -5,6 +5,10 @@ java = "temurin-25.0.2+10.0.LTS" lychee = "0.22.0" protoc = "33.5" +[env] +# renovate: datasource=docker depName=ghcr.io/super-linter/super-linter +SUPER_LINTER_VERSION="v8.4.0@sha256:c5e3307932203ff9e1e8acfe7e92e894add6266605b5d7fb525fb371a59a26f4" + [tasks.ci] description = "CI Build" run = "./mvnw clean install" @@ -43,6 +47,10 @@ run = "./mvnw verify" description = "build all modules without tests" run = "./mvnw install -DskipTests -Dcoverage.skip=true" +[tasks."lint:super-linter"] +description = "Run Super-Linter with auto-fix on the repository" +file = "https://raw.githubusercontent.com/grafana/docker-otel-lgtm/main/.mise/tasks/lint/super-linter.sh" + [tasks."lint:rest"] description = "All lints not covered by super linter" depends = ["lint:links", "lint:bom"]