Merge branch 'main' into phili

rformassspectrometry · Nov 20, 2023 · 55c749d · 55c749d
2 parents 122dfcf + b1273cb
commit 55c749d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/check-bioc.yml b/.github/workflows/check-bioc.yml
@@ -52,9 +52,9 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { os: ubuntu-latest, r: 'devel', bioc: '3.17', cont: "bioconductor/bioconductor_docker:devel", rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest" }
-          - { os: macOS-latest, r: 'next', bioc: '3.17'}
-          - { os: windows-latest, r: 'next', bioc: '3.17'}
+          - { os: ubuntu-latest, r: 'devel', bioc: '3.19', cont: "bioconductor/bioconductor_docker:devel", rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest" }
+          - { os: macOS-latest, r: 'next', bioc: '3.18'}
+          - { os: windows-latest, r: 'next', bioc: '3.18'}
     env:
       R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
       RSPM: ${{ matrix.config.rspm }}

diff --git a/vignettes/Spectra.Rmd b/vignettes/Spectra.Rmd
@@ -24,6 +24,7 @@ BiocStyle::markdown()
 ```{r, echo = FALSE, message = FALSE}
 library(Spectra)
 library(BiocStyle)
+register(SerialParam())
 ```
 
 # Introduction