From bdabe9d7c62559e70101efdf32b74568a0948b3d Mon Sep 17 00:00:00 2001 From: Carl Wilson Date: Mon, 9 Jan 2023 21:43:16 +0000 Subject: [PATCH 1/9] TEST: Added patch test to codecov. --- codecov.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/codecov.yml b/codecov.yml index 122b83fa6..e9f9ae3e4 100644 --- a/codecov.yml +++ b/codecov.yml @@ -6,3 +6,19 @@ coverage: precision: 2 round: down range: "70...100" + status: + patch: + default: + # basic + target: auto + threshold: 0% + base: auto + # advanced + branches: + - integration + if_ci_failed: error #success, error + only_pulls: false + flags: + - "unit" + paths: + - "src" \ No newline at end of file From ed4207e87d15359f15a370d36af55e8022a1b4ed Mon Sep 17 00:00:00 2001 From: Carl Wilson Date: Mon, 9 Jan 2023 21:48:33 +0000 Subject: [PATCH 2/9] TEST: Removed matrix condition for QA. --- .github/workflows/test-pr.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml index 564081a45..a3b98314a 100644 --- a/.github/workflows/test-pr.yml +++ b/.github/workflows/test-pr.yml @@ -43,13 +43,11 @@ jobs: steps: - name: Download coverage report - if: matrix.java-version == 8 uses: actions/download-artifact@v3 with: name: coverage-report path: core/target/site/jacoco/ - name: Codecov coverage reporting - if: matrix.java-version == 8 uses: codecov/codecov-action@v3 with: files: jhove-apps/target/site/jacoco-aggregate/jacoco.xml @@ -57,10 +55,8 @@ jobs: verbose: true # optional (default = false) - name: Codacy coverage reporting uses: codacy/codacy-coverage-reporter-action@v1 - if: matrix.java-version == 8 with: project-token: ${{ secrets.CODACY_PROJECT_TOKEN }} coverage-reports: jhove-apps/target/site/jacoco-aggregate/jacoco.xml - name: Codacy analysis reporting - if: matrix.java-version == 8 uses: codacy/codacy-analysis-cli-action@4.0.0 From f4da6ec12847994adf98e0f199ab91b88951310b Mon Sep 17 00:00:00 2001 From: Carl Wilson Date: Mon, 9 Jan 2023 22:32:45 +0000 Subject: [PATCH 3/9] TEST: Copy aggregate to correct dir. --- .github/workflows/test-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml index a3b98314a..e9cad0347 100644 --- a/.github/workflows/test-pr.yml +++ b/.github/workflows/test-pr.yml @@ -46,7 +46,7 @@ jobs: uses: actions/download-artifact@v3 with: name: coverage-report - path: core/target/site/jacoco/ + path: jhove-apps/target/site/jacoco-aggregate/ - name: Codecov coverage reporting uses: codecov/codecov-action@v3 with: From 36ab69db46a7809c2fffcb3dcf0e74dbbb65292f Mon Sep 17 00:00:00 2001 From: Carl Wilson Date: Mon, 9 Jan 2023 23:14:22 +0000 Subject: [PATCH 4/9] TEST: Tweaked Codecov settings. --- .github/workflows/test-pr.yml | 3 +++ codecov.yml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml index e9cad0347..9bc3ea9df 100644 --- a/.github/workflows/test-pr.yml +++ b/.github/workflows/test-pr.yml @@ -50,7 +50,10 @@ jobs: - name: Codecov coverage reporting uses: codecov/codecov-action@v3 with: + token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos files: jhove-apps/target/site/jacoco-aggregate/jacoco.xml + flags: unittests # optional + name: codecov-umbrella # optional fail_ci_if_error: true # optional (default = false) verbose: true # optional (default = false) - name: Codacy coverage reporting diff --git a/codecov.yml b/codecov.yml index e9f9ae3e4..f2b1fabf3 100644 --- a/codecov.yml +++ b/codecov.yml @@ -19,6 +19,6 @@ coverage: if_ci_failed: error #success, error only_pulls: false flags: - - "unit" + - "unittests" paths: - "src" \ No newline at end of file From 6bf0b9cdceb91775ec0faf44dac90724e6a67e4d Mon Sep 17 00:00:00 2001 From: Carl Wilson Date: Mon, 9 Jan 2023 23:45:37 +0000 Subject: [PATCH 5/9] TEST: Tweaked Codecov settings. --- .github/workflows/test-pr.yml | 1 - codecov.yml | 4 ---- 2 files changed, 5 deletions(-) diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml index 9bc3ea9df..1bf18e0c0 100644 --- a/.github/workflows/test-pr.yml +++ b/.github/workflows/test-pr.yml @@ -52,7 +52,6 @@ jobs: with: token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos files: jhove-apps/target/site/jacoco-aggregate/jacoco.xml - flags: unittests # optional name: codecov-umbrella # optional fail_ci_if_error: true # optional (default = false) verbose: true # optional (default = false) diff --git a/codecov.yml b/codecov.yml index f2b1fabf3..78cc8f76d 100644 --- a/codecov.yml +++ b/codecov.yml @@ -18,7 +18,3 @@ coverage: - integration if_ci_failed: error #success, error only_pulls: false - flags: - - "unittests" - paths: - - "src" \ No newline at end of file From 8669f63273c7e587371ae134e3a5606f0e8169f2 Mon Sep 17 00:00:00 2001 From: Carl Wilson Date: Tue, 10 Jan 2023 00:01:05 +0000 Subject: [PATCH 6/9] TEST: Tweaked Codecov settings. --- codecov.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/codecov.yml b/codecov.yml index 78cc8f76d..b48923049 100644 --- a/codecov.yml +++ b/codecov.yml @@ -13,8 +13,4 @@ coverage: target: auto threshold: 0% base: auto - # advanced - branches: - - integration if_ci_failed: error #success, error - only_pulls: false From 54348e0d76b95e9ecf11a0e0a455fd6fa4d590cf Mon Sep 17 00:00:00 2001 From: Carl Wilson Date: Tue, 10 Jan 2023 00:20:34 +0000 Subject: [PATCH 7/9] TEST: Tweaked Codecov settings. --- codecov.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/codecov.yml b/codecov.yml index b48923049..99c163b51 100644 --- a/codecov.yml +++ b/codecov.yml @@ -9,8 +9,6 @@ coverage: status: patch: default: - # basic + enabled: yes target: auto threshold: 0% - base: auto - if_ci_failed: error #success, error From 223466b3bf3cf5e3d08ad26cfcfd413575c0d081 Mon Sep 17 00:00:00 2001 From: Carl Wilson Date: Tue, 10 Jan 2023 09:18:13 +0000 Subject: [PATCH 8/9] TEST: Tweaked Codecov settings. --- .github/workflows/test-pr.yml | 11 ++++------- codecov.yml | 16 ++++++++++++++-- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml index 1bf18e0c0..ad9825ee0 100644 --- a/.github/workflows/test-pr.yml +++ b/.github/workflows/test-pr.yml @@ -48,13 +48,10 @@ jobs: name: coverage-report path: jhove-apps/target/site/jacoco-aggregate/ - name: Codecov coverage reporting - uses: codecov/codecov-action@v3 - with: - token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos - files: jhove-apps/target/site/jacoco-aggregate/jacoco.xml - name: codecov-umbrella # optional - fail_ci_if_error: true # optional (default = false) - verbose: true # optional (default = false) + run: | + wget https://uploader.codecov.io/latest/alpine/codecov + chmod +x codecov + ./codecov -t ${{ secrets.CODECOV_TOKEN }} - name: Codacy coverage reporting uses: codacy/codacy-coverage-reporter-action@v1 with: diff --git a/codecov.yml b/codecov.yml index 99c163b51..5d6e2f623 100644 --- a/codecov.yml +++ b/codecov.yml @@ -1,14 +1,26 @@ codecov: - token: 8f43ae05-bde9-4f3d-9cc5-a49af1fed3e2 - branch: integration + require_ci_to_pass: true + notify: + wait_for_ci: true coverage: precision: 2 round: down range: "70...100" + project: + default: + enabled: yes + target: 1 + threshold: 0.5 status: patch: default: enabled: yes target: auto threshold: 0% +ignore: + - doc + - .github + - .git + - test-root + - mac From ea116b2bbf2d3a6ee4b66196eb34d25f31a05177 Mon Sep 17 00:00:00 2001 From: Carl Wilson Date: Tue, 10 Jan 2023 09:43:27 +0000 Subject: [PATCH 9/9] TEST: Tweaked Codecov settings. --- .github/workflows/test-pr.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml index ad9825ee0..04fe8cbb4 100644 --- a/.github/workflows/test-pr.yml +++ b/.github/workflows/test-pr.yml @@ -47,11 +47,6 @@ jobs: with: name: coverage-report path: jhove-apps/target/site/jacoco-aggregate/ - - name: Codecov coverage reporting - run: | - wget https://uploader.codecov.io/latest/alpine/codecov - chmod +x codecov - ./codecov -t ${{ secrets.CODECOV_TOKEN }} - name: Codacy coverage reporting uses: codacy/codacy-coverage-reporter-action@v1 with: