From fa61b713adae87541c1b61ea01c75e3c96bded1d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 20 Nov 2025 17:38:37 +0000 Subject: [PATCH 1/2] chore(deps): update all github actions --- .github/workflows/build_and_test.yml | 18 +++++++++--------- .github/workflows/codeql-analysis.yml | 6 +++--- .github/workflows/dependencies.yml | 4 ++-- .github/workflows/detekt.yml | 8 ++++---- .github/workflows/diktat.yml | 8 ++++---- .github/workflows/diktat_snapshot.yml | 8 ++++---- .github/workflows/release.yml | 4 ++-- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 58d0cb4365..60d1a006e4 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -28,12 +28,12 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: # required for correct codecov upload fetch-depth: 0 - name: Set up JDK 11 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: 11 distribution: temurin @@ -60,7 +60,7 @@ jobs: - name: Upload gradle reports if: ${{ always() }} - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: gradle-reports path: '**/build/reports/' @@ -94,9 +94,9 @@ jobs: packages: write steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up JDK 11 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: 11 distribution: temurin @@ -126,7 +126,7 @@ jobs: # into a separate job (or, otherwise, we'd need to upload the content # of the whole `.git` folder as an artifact). - name: JUnit Tests (dorny/test-reporter@v1) - uses: dorny/test-reporter@v1 + uses: dorny/test-reporter@v2 if: ${{ always() }} with: name: JUnit Tests (${{ runner.os }}, dorny/test-reporter@v1) @@ -140,7 +140,7 @@ jobs: continue-on-error: true - name: Upload test results - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 if: ${{ always() }} with: name: xml-test-reports-${{ runner.os }} @@ -150,7 +150,7 @@ jobs: - name: Upload gradle reports if: ${{ always() }} - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: gradle-test-report-${{ matrix.os }} path: '**/build/reports/' @@ -192,7 +192,7 @@ jobs: pull-requests: write steps: - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v6 if: ${{ always() }} with: name: xml-test-reports-${{ runner.os }} diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index f89e4782c2..608c2ea860 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -30,7 +30,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: # We must fetch at least the immediate parents so that if this is # a pull request then we can checkout the head. @@ -38,7 +38,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v3 + uses: github/codeql-action/init@v4 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -78,4 +78,4 @@ jobs: -PgprKey=${{ secrets.GITHUB_TOKEN }} - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v3 + uses: github/codeql-action/analyze@v4 diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml index afc419255f..a2c66d105d 100644 --- a/.github/workflows/dependencies.yml +++ b/.github/workflows/dependencies.yml @@ -18,7 +18,7 @@ jobs: contents: write steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: # Fetch Git tags, so that semantic version can be calculated. # Alternatively, run `git fetch --prune --unshallow --tags` as the @@ -27,7 +27,7 @@ jobs: fetch-depth: 0 - name: 'Set up Java 11' - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'zulu' java-version: 11 diff --git a/.github/workflows/detekt.yml b/.github/workflows/detekt.yml index c6761e3b1e..217796dee9 100644 --- a/.github/workflows/detekt.yml +++ b/.github/workflows/detekt.yml @@ -13,9 +13,9 @@ jobs: security-events: write steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up JDK 11 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: 11 distribution: temurin @@ -29,12 +29,12 @@ jobs: -PgprUser=${{ github.actor }} -PgprKey=${{ secrets.GITHUB_TOKEN }} - name: Upload SARIF report to Github - uses: github/codeql-action/upload-sarif@v3 + uses: github/codeql-action/upload-sarif@v4 if: ${{ always() }} with: sarif_file: build/detekt-sarif-reports/detekt-merged.sarif - name: Upload SARIF artifacts - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 if: ${{ failure() }} with: name: sarif-reports diff --git a/.github/workflows/diktat.yml b/.github/workflows/diktat.yml index e75f0483bf..bd1e87132b 100644 --- a/.github/workflows/diktat.yml +++ b/.github/workflows/diktat.yml @@ -14,10 +14,10 @@ jobs: security-events: write steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up JDK 11 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: 11 distribution: temurin @@ -36,12 +36,12 @@ jobs: -PgprKey=${{ secrets.GITHUB_TOKEN }} --stacktrace - name: Upload SARIF report to Github - uses: github/codeql-action/upload-sarif@v3 + uses: github/codeql-action/upload-sarif@v4 if: ${{ always() }} with: sarif_file: build/reports/diktat/diktat-merged.sarif - name: Upload SARIF artifacts - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 if: ${{ failure() }} with: name: sarif-reports diff --git a/.github/workflows/diktat_snapshot.yml b/.github/workflows/diktat_snapshot.yml index d3ada4b4f5..1965485d2f 100644 --- a/.github/workflows/diktat_snapshot.yml +++ b/.github/workflows/diktat_snapshot.yml @@ -15,7 +15,7 @@ jobs: security-events: write steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: # Fetch Git tags, so that semantic version can be calculated. # Alternatively, run `git fetch --prune --unshallow --tags` as the @@ -24,7 +24,7 @@ jobs: fetch-depth: 0 - name: Set up JDK 11 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: 11 distribution: temurin @@ -65,14 +65,14 @@ jobs: -PgprUser=${{ github.actor }} -PgprKey=${{ secrets.GITHUB_TOKEN }} - name: Upload SARIF report to Github - uses: github/codeql-action/upload-sarif@v3 + uses: github/codeql-action/upload-sarif@v4 if: ${{ always() }} with: sarif_file: build/reports/diktat/diktat-merged.sarif # override category to have a different with release version category: diktat (snapshot) - name: Upload SARIF artifacts - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 if: ${{ failure() }} with: name: sarif-reports diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 24d197fdbd..0300cca91d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: # Fetch Git tags, so that semantic version can be calculated. # Alternatively, run `git fetch --prune --unshallow --tags` as the @@ -28,7 +28,7 @@ jobs: fetch-depth: 0 - name: 'Set up Java' - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: 11 distribution: temurin From 0972d41a15adfa659104475e6212d14a89fff303 Mon Sep 17 00:00:00 2001 From: "Andrey S." Date: Fri, 28 Nov 2025 13:04:26 +0300 Subject: [PATCH 2/2] Update Copyright year in order to fix smoke tests --- .../resources/test/smoke/src/main/kotlin/Example5Expected.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diktat-cli/src/test/resources/test/smoke/src/main/kotlin/Example5Expected.kt b/diktat-cli/src/test/resources/test/smoke/src/main/kotlin/Example5Expected.kt index c6c2a13637..276c5f89f1 100644 --- a/diktat-cli/src/test/resources/test/smoke/src/main/kotlin/Example5Expected.kt +++ b/diktat-cli/src/test/resources/test/smoke/src/main/kotlin/Example5Expected.kt @@ -1,6 +1,6 @@ // ;warn:$line:1: [FILE_NAME_MATCH_CLASS] file name is incorrect - it should match with the class described in it if there is the only one class declared: Example5Expected.kt vs Some{{.*}} /* - Copyright 2018-2024 John Doe. + Copyright 2018-2025 John Doe. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at