Skip to content

Commit a24115a

Browse files
authored
Modify GHA
1 parent 20b28ed commit a24115a

1 file changed

Lines changed: 7 additions & 14 deletions

File tree

‎.github/workflows/check-bioc.yml‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ jobs:
5252
fail-fast: false
5353
matrix:
5454
config:
55-
- { os: ubuntu-latest, r: '4.5', bioc: '3.22', cont: "bioconductor/bioconductor_docker:RELEASE_3_22", rspm: "https://packagemanager.rstudio.com/cran/__linux__/jammy/latest" }
56-
- { os: ubuntu-latest, r: '4.6', bioc: 'devel', cont: "bioconductor/bioconductor_docker:devel", rspm: "https://packagemanager.rstudio.com/cran/__linux__/jammy/latest" }
55+
- { os: ubuntu-latest, r: '4.5', bioc: '3.22', cont: "bioconductor/bioconductor_docker:RELEASE_3_22", rspm: "https://p3m.dev/cran/__linux__/noble/latest" }
56+
- { os: ubuntu-latest, r: 'devel', bioc: 'devel', cont: "bioconductor/bioconductor_docker:devel", rspm: "https://p3m.dev/cran/__linux__/noble/latest" }
5757
- { os: macOS-latest, r: 'devel', bioc: 'devel'}
5858
- { os: windows-latest, r: 'devel', bioc: 'devel'}
5959
## Check https://github.com/r-lib/actions/tree/master/examples
@@ -117,24 +117,13 @@ jobs:
117117
key: ${{ env.cache-version }}-${{ runner.os }}-biocversion-devel-r-4.5-${{ hashFiles('.github/depends.Rds') }}
118118
restore-keys: ${{ env.cache-version }}-${{ runner.os }}-biocversion-devel-r-4.5-
119119

120-
# - name: Install Linux system dependencies
121-
# if: runner.os == 'Linux'
122-
# run: |
123-
# sysreqs=$(Rscript -e 'cat("apt-get update -y && apt-get install -y", paste(gsub("apt-get install -y ", "", remotes::system_requirements("ubuntu", "20.04")), collapse = " "))')
124-
# echo $sysreqs
125-
# sudo -s eval "$sysreqs"
126-
127120
- name: Install macOS system dependencies
128121
if: matrix.config.os == 'macOS-latest'
129122
run: |
130123
## Enable installing XML from source if needed
131124
brew install libxml2
132125
echo "XML_CONFIG=/usr/local/opt/libxml2/bin/xml2-config" >> $GITHUB_ENV
133126
134-
## ## Required to install magick as noted at
135-
## ## https://github.com/r-lib/usethis/commit/f1f1e0d10c1ebc75fd4c18fa7e2de4551fd9978f#diff-9bfee71065492f63457918efcd912cf2
136-
## brew install imagemagick@6
137-
138127
## For textshaping, required by ragg, and required by pkgdown
139128
brew install harfbuzz fribidi
140129
@@ -172,7 +161,11 @@ jobs:
172161
173162
## For running the checks
174163
message(paste('****', Sys.time(), 'installing rcmdcheck and BiocCheck ****'))
175-
install.packages(c("rcmdcheck", "BiocCheck"), repos = BiocManager::repositories())
164+
install.packages(c("rcmdcheck", "BiocCheck", "remotes"), repos = BiocManager::repositories())
165+
166+
## TEMP REMOVE LATER:
167+
## For now install Rarr from github since ZarrArray needs >= 1.11.33
168+
remotes::install_github("Huber-group-EMBL/Rarr")
176169
177170
## Pass #1 at installing dependencies
178171
message(paste('****', Sys.time(), 'pass number 1 at installing dependencies: local dependencies ****'))

0 commit comments

Comments
 (0)