Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/saveourtool/diktat into b…
Browse files Browse the repository at this point in the history
…ugfix/kdoc_formatting

# Conflicts:
#	diktat-cli/src/test/kotlin/com/saveourtool/diktat/smoke/DiktatSmokeTestBase.kt
  • Loading branch information
DrAlexD committed Jun 17, 2024
2 parents bebee7d + f63b045 commit dc3de66
Show file tree
Hide file tree
Showing 40 changed files with 3,531 additions and 193 deletions.
30 changes: 13 additions & 17 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ jobs:
echo KOTLIN_VERSION=$kv >> $GITHUB_ENV
shell: bash
- name: Cache konan
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.konan
key: ${{ runner.os }}-gradle-konan-${{ env.KOTLIN_VERSION }}
- name: Build all
uses: gradle/gradle-build-action@v2
uses: gradle/gradle-build-action@v3
with:
gradle-version: wrapper
gradle-home-cache-cleanup: true
Expand All @@ -66,7 +66,11 @@ jobs:
path: '**/build/reports/'
retention-days: 1
- name: Code coverage report
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
# Do not run coverage for forks since they cannot upload the results to codecov.
# For reference, see:
# https://docs.github.com/en/actions/using-jobs/using-conditions-to-control-job-execution#example-only-run-job-for-specific-repository
if: github.repository == 'saveourtool/diktat'
with:
fail_ci_if_error: false
token: ${{ secrets.CODECOV_TOKEN }}
Expand All @@ -91,9 +95,6 @@ jobs:

steps:
- uses: actions/checkout@v4
with:
# required for correct codecov upload
fetch-depth: 0
- name: Set up JDK 11
uses: actions/setup-java@v4
with:
Expand All @@ -105,13 +106,13 @@ jobs:
echo KOTLIN_VERSION=$kv >> $GITHUB_ENV
shell: bash
- name: Cache konan
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.konan
key: ${{ runner.os }}-gradle-konan-${{ env.KOTLIN_VERSION }}

- name: Build all
uses: gradle/gradle-build-action@v2
uses: gradle/gradle-build-action@v3
with:
gradle-version: wrapper
gradle-home-cache-cleanup: true
Expand Down Expand Up @@ -154,16 +155,11 @@ jobs:
name: gradle-test-report-${{ matrix.os }}
path: '**/build/reports/'
retention-days: 1
- name: Code coverage report
uses: codecov/codecov-action@v3
with:
fail_ci_if_error: false
token: ${{ secrets.CODECOV_TOKEN }}

- name: 'Publish a snapshot to GitHub'
id: publish-github
if: ${{ github.event_name == 'push' && github.ref_type == 'branch' && github.ref == 'refs/heads/master' }}
uses: gradle/gradle-build-action@v2
if: ${{ github.event_name == 'push' && github.ref_type == 'branch' && github.ref == 'refs/heads/master' && github.repository == 'saveourtool/diktat' }}
uses: gradle/gradle-build-action@v3
with:
gradle-version: wrapper
arguments: |
Expand All @@ -172,8 +168,8 @@ jobs:
- name: 'Publish a snapshot to Maven Central'
id: publish-sonatype
if: ${{ github.event_name == 'push' && github.ref_type == 'branch' && github.ref == 'refs/heads/master' }}
uses: gradle/gradle-build-action@v2
if: ${{ github.event_name == 'push' && github.ref_type == 'branch' && github.ref == 'refs/heads/master' && github.repository == 'saveourtool/diktat' }}
uses: gradle/gradle-build-action@v3
with:
gradle-version: wrapper
arguments: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
# and modify them (or add more) to build your code if your project
# uses a compiled language

- uses: gradle/gradle-build-action@v2
- uses: gradle/gradle-build-action@v3
with:
gradle-version: wrapper
# The `--continue` flag is necessary so that Gradle keeps going after the 1st test failure.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
java-version: 11

- name: 'Run snapshot action'
uses: mikepenz/gradle-dependency-submission@v0.9.1
uses: mikepenz/gradle-dependency-submission@v1.0.0
with:
use-gradlew: true
gradle-build-module: |-
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/detekt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
with:
java-version: 11
distribution: temurin
- uses: gradle/gradle-build-action@v2
- uses: gradle/gradle-build-action@v3
with:
gradle-version: wrapper
arguments: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/diktat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
java-version: 11
distribution: temurin

- uses: gradle/gradle-build-action@v2
- uses: gradle/gradle-build-action@v3
with:
gradle-version: wrapper
arguments: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/diktat_snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

- name: 'Cache ~/.konan'
id: cache-konan
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.konan
Expand All @@ -42,7 +42,7 @@ jobs:
- name: 'Publish a snapshot version to local repo'
id: generateLibsForDiktatSnapshot
uses: gradle/gradle-build-action@v2
uses: gradle/gradle-build-action@v3
with:
gradle-version: wrapper
arguments: |
Expand All @@ -52,7 +52,7 @@ jobs:
-x diktatCheck
# copied from .github/workflows/diktat.yml
- uses: gradle/gradle-build-action@v2
- uses: gradle/gradle-build-action@v3
with:
gradle-version: wrapper
arguments: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- name: 'Publish a release to Maven Central'
id: publish-sonatype
uses: gradle/gradle-build-action@v2
uses: gradle/gradle-build-action@v3
with:
gradle-version: wrapper
arguments: |
Expand All @@ -48,7 +48,7 @@ jobs:
- name: 'Publish a release to Gradle Plugins'
id: publish-gradle
uses: gradle/gradle-build-action@v2
uses: gradle/gradle-build-action@v3
with:
gradle-version: wrapper
arguments: |
Expand All @@ -58,7 +58,7 @@ jobs:
- name: 'Publish a release to GitHub'
id: publish-github
uses: gradle/gradle-build-action@v2
uses: gradle/gradle-build-action@v3
with:
gradle-version: wrapper
arguments: |
Expand Down
Loading

0 comments on commit dc3de66

Please sign in to comment.