Merge pull request #248 from jmbarbone/247-timezone

247 timezone
jmbarbone · Dec 2, 2024 · 532ea42 · 532ea42
2 parents 7695a76 + c2cd39a
commit 532ea42
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 11 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -4,9 +4,10 @@ on:
   push:
     branches: [main, master]
   pull_request:
-    branches: [main, master]
 
-name: R-CMD-check
+name: R-CMD-check.yaml
+
+permissions: read-all
 
 jobs:
   R-CMD-check:

diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml
@@ -4,12 +4,13 @@ on:
   push:
     branches: [main, master]
   pull_request:
-    branches: [main, master]
   release:
     types: [published]
   workflow_dispatch:
 
-name: pkgdown
+name: pkgdown.yaml
+
+permissions: read-all
 
 jobs:
   pkgdown:

diff --git a/.github/workflows/pr-commands.yaml b/.github/workflows/pr-commands.yaml
@@ -4,7 +4,9 @@ on:
   issue_comment:
     types: [created]
 
-name: Commands
+name: pr-commands.yaml
+
+permissions: read-all
 
 jobs:
   document:
@@ -13,6 +15,8 @@ jobs:
     runs-on: ubuntu-latest
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+    permissions:
+      contents: write
     steps:
       - uses: actions/checkout@v4
 
@@ -50,6 +54,8 @@ jobs:
     runs-on: ubuntu-latest
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+    permissions:
+      contents: write
     steps:
       - uses: actions/checkout@v4
 

diff --git 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:
@@ -23,18 +24,28 @@ 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(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: |

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: mark
 Type: Package
 Title: Miscellaneous, Analytic R Kernels
-Version: 0.8.1.9001
+Version: 0.8.1.9002
 Authors@R:
     person(given   = "Jordan Mark",
            family  = "Barbone",

diff --git a/NEWS.md b/NEWS.md
@@ -3,6 +3,8 @@
 * `read_clipboard()` and `write_clipboard()` now use `{clipr}` to work on non-Windows platforms [#125](https://github.com/jmbarbone/mark/issues/125)
 * `read_clipboard()` now works with more methods for reading `data.frame`s
 * `read_clipboard()` now defaults to a `tibble` return when `{tibble}` is available
+* timezone testing updated [#247](https://github.com/jmbarbone/mark/issues/247)
+* actions updated
 
 # mark 0.8.1
 

diff --git a/README.Rmd b/README.Rmd
@@ -21,6 +21,7 @@ set.seed(42)
 [![CRAN status](https://www.r-pkg.org/badges/version/mark)](https://CRAN.R-project.org/package=mark)
 [![R-CMD-check](https://github.com/jmbarbone/mark/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/jmbarbone/mark/actions/workflows/R-CMD-check.yaml)
 [![Codecov test coverage](https://codecov.io/gh/jmbarbone/mark/branch/main/graph/badge.svg)](https://app.codecov.io/gh/jmbarbone/mark?branch=main)
+[![Codecov test coverage](https://codecov.io/gh/jmbarbone/mark/graph/badge.svg)](https://app.codecov.io/gh/jmbarbone/mark)
 <!-- badges: end -->
 
 Miscellaneous, Analytic R Kernels

diff --git a/tests/testthat/test-diff-time.R b/tests/testthat/test-diff-time.R
@@ -66,7 +66,7 @@ test_that("Timezones", {
     a = rep(st, 4),
     b = rep(st, 4),
     tza = c("GMT", "UTC", "America/New_York", "Pacific/Auckland"),
-    tzb = c("GMT", "Africa/Casablanca", "America/Chicago", "CET"),
+    tzb = c("GMT", "Africa/Casablanca", "America/Chicago", "Europe/Rome"),
     tzn = c(0, 1, -1, 6) * 3600
   )