diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml index 2c5bb50..e050312 100644 --- a/.github/workflows/test-coverage.yaml +++ b/.github/workflows/test-coverage.yaml @@ -4,9 +4,10 @@ on: push: branches: [main, master] pull_request: - branches: [main, master] -name: test-coverage +name: test-coverage.yaml + +permissions: read-all jobs: test-coverage: @@ -15,7 +16,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 +24,38 @@ 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") ) + covr::to_cobertura(cov) shell: Rscript {0} + - uses: codecov/codecov-action@v4 + 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 }} + file: ./cobertura.xml + plugin: 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 diff --git a/DESCRIPTION b/DESCRIPTION index 13c56dd..23f6ecc 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: datamods Title: Modules to Import and Manipulate Data in 'Shiny' -Version: 1.5.3 +Version: 1.5.3.9000 Authors@R: c(person(given = "Victor", family = "Perrier", diff --git a/NEWS.md b/NEWS.md index 00e5ee4..225ca37 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,8 @@ +# datamods 1.5.4 + +* Rename CSS class `show` to `show-block` (used internally) + + # datamods 1.5.3 * `update_variables_server`: change of data update management after clicking on the validate button, fixed a problem when input data are the same as output data. diff --git a/README.Rmd b/README.Rmd index cbc613f..3b004a4 100644 --- a/README.Rmd +++ b/README.Rmd @@ -21,6 +21,7 @@ knitr::opts_chunk$set( [![CRAN status](https://www.r-pkg.org/badges/version/datamods)](https://CRAN.R-project.org/package=datamods) [![cranlogs](https://cranlogs.r-pkg.org/badges/datamods)](https://cran.r-project.org/package=datamods) [![R-CMD-check](https://github.com/dreamRs/datamods/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/dreamRs/datamods/actions/workflows/R-CMD-check.yaml) +[![Codecov test coverage](https://codecov.io/gh/dreamRs/datamods/graph/badge.svg)](https://app.codecov.io/gh/dreamRs/datamods) diff --git a/README.md b/README.md index d72c10e..327c600 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,8 @@ status](https://www.r-pkg.org/badges/version/datamods)](https://CRAN.R-project.org/package=datamods) [![cranlogs](https://cranlogs.r-pkg.org/badges/datamods)](https://cran.r-project.org/package=datamods) [![R-CMD-check](https://github.com/dreamRs/datamods/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/dreamRs/datamods/actions/workflows/R-CMD-check.yaml) +[![Codecov test +coverage](https://codecov.io/gh/dreamRs/datamods/graph/badge.svg)](https://app.codecov.io/gh/dreamRs/datamods) ### Overview