From 67d4f8a605da247b8c3befbf547c6d4d8d94f9b9 Mon Sep 17 00:00:00 2001 From: jpcompartir Date: Fri, 2 Jan 2026 09:59:02 +0000 Subject: [PATCH 1/2] Remove the badge comments from the README to rendeer the badges in the appropriate loc --- README.Rmd | 11 +++-------- README.md | 5 ----- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/README.Rmd b/README.Rmd index 9a1592e..9adc5e3 100644 --- a/README.Rmd +++ b/README.Rmd @@ -15,14 +15,9 @@ knitr::opts_chunk$set( # DisplayR ---- - - -[![R-CMD-check](https://github.com/jpcompartir/DisplayR/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/jpcompartir/DisplayR/actions/workflows/R-CMD-check.yaml) -[![pkgdown](https://github.com/jpcompartir/DisplayR/actions/workflows/pkgdown.yaml/badge.svg)](https://github.com/jpcompartir/DisplayR/actions/workflows/pkgdown.yaml) - +[![R-CMD-check](https://github.com/jpcompartir/DisplayR/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/jpcompartir/DisplayR/actions/workflows/R-CMD-check.yaml) [![pkgdown](https://github.com/jpcompartir/DisplayR/actions/workflows/pkgdown.yaml/badge.svg)](https://github.com/jpcompartir/DisplayR/actions/workflows/pkgdown.yaml) ---- +------------------------------------------------------------------------ DisplayR is SAMY Data Science's comprehensive package for data visualisation, offering a wide array of functions tailored to meet various data visualisation needs. This versatile package aims to improve data presentation and communication by providing visually engaging and informative graphics. @@ -37,6 +32,6 @@ You can install the development version of DisplayR from [GitHub](https://github devtools::install_github("jpcompartir/DisplayR") ``` ---- +------------------------------------------------------------------------ SAMY Data Science diff --git a/README.md b/README.md index f6db412..63a15b4 100644 --- a/README.md +++ b/README.md @@ -3,13 +3,8 @@ # DisplayR ------------------------------------------------------------------------- - - - [![R-CMD-check](https://github.com/jpcompartir/DisplayR/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/jpcompartir/DisplayR/actions/workflows/R-CMD-check.yaml) [![pkgdown](https://github.com/jpcompartir/DisplayR/actions/workflows/pkgdown.yaml/badge.svg)](https://github.com/jpcompartir/DisplayR/actions/workflows/pkgdown.yaml) - ------------------------------------------------------------------------ From c72bce938328c8b1c13c6d447d016f73f6c5dd97 Mon Sep 17 00:00:00 2001 From: jpcompartir Date: Fri, 2 Jan 2026 10:33:02 +0000 Subject: [PATCH 2/2] Update triggers on GHAs Add new test cov GHA --- .github/workflows/R-CMD-check.yaml | 2 +- .github/workflows/pkgdown.yaml | 3 +-- .github/workflows/test-coverage.yaml | 29 ++++++++++++++++++++-------- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index f4b17a4..594caa4 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -4,7 +4,7 @@ on: push: branches: [main, master] pull_request: - branches: [main, master] + workflow_dispatch: name: R-CMD-check diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml index ed7650c..b6e6d75 100644 --- a/.github/workflows/pkgdown.yaml +++ b/.github/workflows/pkgdown.yaml @@ -4,10 +4,9 @@ on: push: branches: [main, master] pull_request: - branches: [main, master] + workflow_dispatch: release: types: [published] - workflow_dispatch: name: pkgdown diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml index 2c5bb50..8563c2d 100644 --- a/.github/workflows/test-coverage.yaml +++ b/.github/workflows/test-coverage.yaml @@ -4,9 +4,11 @@ on: push: branches: [main, master] pull_request: - branches: [main, master] + workflow_dispatch: + +name: test-coverage.yaml -name: test-coverage +permissions: read-all jobs: test-coverage: @@ -15,7 +17,7 @@ jobs: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: r-lib/actions/setup-r@v2 with: @@ -23,28 +25,39 @@ jobs: - uses: r-lib/actions/setup-r-dependencies@v2 with: - extra-packages: any::covr + extra-packages: any::covr, any::xml2 needs: coverage - name: Test coverage run: | - covr::codecov( + cov <- covr::package_coverage( quiet = FALSE, clean = FALSE, - install_path = file.path(Sys.getenv("RUNNER_TEMP"), "package") + install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package") ) + print(cov) + covr::to_cobertura(cov) shell: Rscript {0} + - uses: codecov/codecov-action@v5 + with: + # Fail if error if not on PR, or if on PR and token is given + fail_ci_if_error: ${{ github.event_name != 'pull_request' || secrets.CODECOV_TOKEN }} + files: ./cobertura.xml + plugins: noop + disable_search: true + token: ${{ secrets.CODECOV_TOKEN }} + - name: Show testthat output if: always() run: | ## -------------------------------------------------------------------- - find ${{ runner.temp }}/package -name 'testthat.Rout*' -exec cat '{}' \; || true + find '${{ runner.temp }}/package' -name 'testthat.Rout*' -exec cat '{}' \; || true shell: bash - name: Upload test results if: failure() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: coverage-test-failures path: ${{ runner.temp }}/package