Bump codecov/codecov-action from 1 to 2 (#1038)

* Bump codecov/codecov-action from 1 to 2 updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-major * Change cache keys (maven repo is platform independent) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Peter Trifanov <[email protected]> Co-authored-by: Andrey Kuleshov <[email protected]>
saveourtool · Dec 14, 2021 · 87ae5c0 · 87ae5c0
1 parent 14d1272
commit 87ae5c0
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -19,15 +19,15 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-build-${{ hashFiles('**/pom.xml') }}
+          key: maven-build-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
-            ${{ runner.os }}-maven-build-
+            maven-build-
       - name: Maven Install
         run: mvn -B clean install
       - name: Code coverage report
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v2
         with:
-          file: ./*/target/site/jacoco/jacoco.xml
+          files: '**/target/site/jacoco*/jacoco.xml,**/reports/jacoco/**/*.xml'
           flags: unittests
           fail_ci_if_error: true # optional (default = false)
       - name: Upload diktat jar
@@ -130,9 +130,9 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-build-${{ hashFiles('**/pom.xml') }}
+          key: maven-build-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
-            ${{ runner.os }}-maven-build-
+            maven-build-
 
       - name: Maven Install
         if: ${{ runner.os == 'Linux' || runner.os == 'macOS' }}

diff --git a/.github/workflows/detekt.yml b/.github/workflows/detekt.yml
@@ -21,9 +21,9 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-detekt-${{ hashFiles('**/pom.xml') }}
+          key: maven-detekt-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
-            ${{ runner.os }}-maven-detekt-
+            maven-detekt-
       # when running detekt with type resolution, we need to have all project modules compiled too
       - name: running deteKT
         run: mvn -B compile dependency:build-classpath@detekt detekt:check@detekt -DskipPluginMarker
diff --git a/.github/workflows/diktat.yml b/.github/workflows/diktat.yml
@@ -24,9 +24,9 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-diktat-${{ hashFiles('**/pom.xml') }}
+          key: maven-diktat-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
-            ${{ runner.os }}-maven-diktat-
+            maven-diktat-
       - name: Substitute diktat config with the one from the latest release
         # fixme: can be done from the fetched repo without additional network request
         run: |

diff --git a/.github/workflows/diktat_snapshot.yml b/.github/workflows/diktat_snapshot.yml
@@ -24,9 +24,9 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-build-${{ hashFiles('**/pom.xml') }}
+          key: maven-build-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
-            ${{ runner.os }}-maven-build
+            maven-build
       - name: Set version
         # Set project version which will then be used to run diktat from local maven repo.
         # Base version is stored in env variable for later usage.

diff --git a/.github/workflows/metrics_for_master.yml b/.github/workflows/metrics_for_master.yml
@@ -25,15 +25,15 @@ jobs:
         # keys are the same as in build_and_test workflow to make cache available for PRs
         with:
           path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-build-${{ hashFiles('**/pom.xml') }}
+          key: maven-build-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
-            ${{ runner.os }}-maven-build-
+            maven-build-
       - name: Run tests
         # we need to run `install` goal here so that gradle will be able to resolve dependencies and run tests on diktat-gradle-plugin
         run: mvn -B install -DskipPluginMarker
       - name: Generate code coverage report
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v2
         with:
-          file: ./*/target/site/jacoco/jacoco.xml
+          files: '**/target/site/jacoco*/jacoco.xml,**/reports/jacoco/**/*.xml'
           flags: unittests
           fail_ci_if_error: true # optional (default = false)
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -22,9 +22,9 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-master-${{ hashFiles('**/pom.xml') }}
+          key: maven-build-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
-            ${{ runner.os }}-maven-master-
+            maven-build-
       - name: Setup environment
         env:
           DIKTAT_GPG_PUB: ${{ secrets.DIKTAT_PGP_PUB }}