diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index b0d6e2f9e..d78b6111c 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -27,18 +27,9 @@ jobs: - name: Step 4 - Build & Test run: mvn clean verify -ntp -PIT - - name: Step 5 - Upload coverage unittests reports to Codecov - uses: codecov/codecov-action@v3 + - name: Step 5 - Upload coverage reports to Codecov + uses: codecov/codecov-action@v4 with: + fail_ci_if_error: true token: ${{ secrets.CODECOV_TOKEN }} - gcov_ignore: '!*datasafe-business*' - flags: unittests verbose: true - - - name: Step 6 - Upload coverage e2e tests reports to Codecov - uses: codecov/codecov-action@v3 - with: - token: ${{ secrets.CODECOV_TOKEN }} - gcov_include: '*datasafe-business*' - flags: e2e_tests - verbose: true \ No newline at end of file diff --git a/.github/workflows/push-develop.yml b/.github/workflows/push-develop.yml index cebd686b3..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: @@ -35,19 +42,3 @@ jobs: GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }} GPG_OWNERTRUST: ${{ secrets.GPG_OWNERTRUST }} - - - name: Step 6 - Upload coverage unittests reports to Codecov - uses: codecov/codecov-action@v3 - with: - token: ${{ secrets.CODECOV_TOKEN }} - gcov_ignore: '!*datasafe-business*' - flags: unittests - verbose: true - - - name: Step 7 - Upload coverage e2e tests reports to Codecov - uses: codecov/codecov-action@v3 - with: - token: ${{ secrets.CODECOV_TOKEN }} - gcov_include: '*datasafe-business*' - flags: e2e_tests - verbose: true \ No newline at end of file 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