From f93e0d4630c9559c98baddc9bf0259a0f317752b Mon Sep 17 00:00:00 2001
From: Maxim Grischenko <maksym.hryshchenko@adorsys.com>
Date: Tue, 4 Jun 2024 17:08:36 +0200
Subject: [PATCH] fix codecov

---
 .github/workflows/codecov.yml      | 16 ----------------
 .github/workflows/pull-request.yml |  7 +++++++
 .github/workflows/push-develop.yml |  7 +++++++
 scripts/mvn_deploy.sh              |  2 +-
 4 files changed, 15 insertions(+), 17 deletions(-)
 delete mode 100644 .github/workflows/codecov.yml

diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
deleted file mode 100644
index dc77c294a..000000000
--- a/.github/workflows/codecov.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Develop branch build
-on:
-  workflow_run:
-    workflows: ["pull-request-job", "develop-build-job"]
-    types: [completed]
-
-jobs:
-  codecov-job:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Upload coverage unittests reports to Codecov
-        uses: codecov/codecov-action@v4
-        with:
-          fail_ci_if_error: true
-          token: ${{ secrets.CODECOV_TOKEN }}
-          verbose: true
\ No newline at end of file
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index c15a832e4..d78b6111c 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -26,3 +26,10 @@ jobs:
 
       - name: Step 4 - Build & Test
         run: mvn clean verify -ntp -PIT
+
+      - name: Step 5 - Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v4
+        with:
+          fail_ci_if_error: true
+          token: ${{ secrets.CODECOV_TOKEN }}
+          verbose: true
diff --git a/.github/workflows/push-develop.yml b/.github/workflows/push-develop.yml
index 6b506d77f..46593f695 100644
--- a/.github/workflows/push-develop.yml
+++ b/.github/workflows/push-develop.yml
@@ -26,6 +26,13 @@ jobs:
       - name: Step 4 - Build & Test
         run: mvn clean verify -ntp -PIT
 
+      - name: Step 5 - Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v4
+        with:
+          fail_ci_if_error: true
+          token: ${{ secrets.CODECOV_TOKEN }}
+          verbose: true
+
       - name: Step 5 - Deploy Snapshot
         run: ./scripts/mvn_deploy.sh
         env:
diff --git a/scripts/mvn_deploy.sh b/scripts/mvn_deploy.sh
index dbf870f1f..47dfb8067 100755
--- a/scripts/mvn_deploy.sh
+++ b/scripts/mvn_deploy.sh
@@ -5,4 +5,4 @@ set -e
 echo "$GPG_SECRET_KEY" | base64 --decode | $GPG_EXECUTABLE --import --no-tty --batch --yes || true
 echo "$GPG_OWNERTRUST" | base64 --decode | $GPG_EXECUTABLE --import-ownertrust --no-tty --batch --yes || true
 
-mvn clean deploy -ntp --settings scripts/settings.xml gpg:sign -Prelease -DskipTests -U || exit 1
\ No newline at end of file
+mvn deploy -ntp --settings scripts/settings.xml gpg:sign -Prelease -DskipTests -U || exit 1
\ No newline at end of file