Merge branch 'main' into dramanica/main

rstudio · Aug 8, 2024 · bce9dcf · bce9dcf
2 parents 613caa7 + 4e55e7c
commit bce9dcf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -25,6 +25,9 @@ jobs:
           - { os: windows-latest, r: 'release', python: '3.10' }
           - { os: ubuntu-latest , r: 'release', python: '3.10' }
 
+          # test R oldrel on mac too: https://github.com/RcppCore/RcppArmadillo/issues/447
+          - { os: macOS-latest , r: 'oldrel'  , python: '3.10' }
+
           - { os: ubuntu-latest, r: 'oldrel-1', python: '3.9' }
           - { os: ubuntu-latest, r: 'oldrel-2', python: '3.9' }
           - { os: ubuntu-20.04,  r: 'oldrel-3', python: '3.8' }

diff --git a/tests/testthat/_snaps/python-knitr-engine/test-chunking.md b/tests/testthat/_snaps/python-knitr-engine/test-chunking.md
@@ -23,7 +23,6 @@ prose
     print(len(y))
     ## 3
 
-
     # Comment about type should be attached to the code below (like R). 
     # The output from the previous command should not be part of this
     print(type(y))
@@ -49,7 +48,6 @@ prose
     print(length(x))
     ## [1] 3
 
-
     # Comment about class is attached to the code below (as expected)
     print(class(x))
     ## [1] "numeric"