Skip to content

Commit 5e46efa

Browse files
authored
Merge pull request #18 from fmicompbio/test-actions
Use the bioc-action to set up R/BiocManager
2 parents 5eb2073 + 46d8759 commit 5e46efa

1 file changed

Lines changed: 12 additions & 18 deletions

File tree

.github/workflows/check-bioc.yml

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,17 @@ env:
4444
jobs:
4545
build-check:
4646
runs-on: ${{ matrix.config.os }}
47-
name: ${{ matrix.config.os }} (${{ matrix.config.r }})
47+
name: ${{ matrix.config.os }} (${{ matrix.config.bioc }})
4848
container: ${{ matrix.config.cont }}
4949
## Environment variables unique to this job.
5050

5151
strategy:
5252
fail-fast: false
5353
matrix:
5454
config:
55-
- { os: ubuntu-latest, r: 'devel', bioc: '3.17', cont: "bioconductor/bioconductor_docker:devel", rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest" }
56-
- { os: macOS-latest, r: 'devel', bioc: '3.17'}
57-
- { os: windows-latest, r: 'devel', bioc: '3.17'}
55+
- { os: ubuntu-latest, bioc: 'devel', cont: "bioconductor/bioconductor_docker:devel", rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest" }
56+
- { os: macOS-latest, bioc: 'devel'}
57+
- { os: windows-latest, bioc: 'devel'}
5858
## Check https://github.com/r-lib/actions/tree/master/examples
5959
## for examples using the http-user-agent
6060
env:
@@ -82,12 +82,11 @@ jobs:
8282
uses: actions/checkout@v3
8383

8484
## R is already included in the Bioconductor docker images
85-
- name: Setup R from r-lib
85+
- name: Set up R and install BiocManager
8686
if: runner.os != 'Linux'
87-
uses: r-lib/actions/setup-r@v2
87+
uses: grimbough/bioc-actions/setup-bioc@v1
8888
with:
89-
r-version: ${{ matrix.config.r }}
90-
http-user-agent: ${{ matrix.config.http-user-agent }}
89+
bioc-version: ${{ matrix.config.bioc }}
9190

9291
## pandoc is already included in the Bioconductor docker images
9392
- name: Setup pandoc from r-lib
@@ -105,16 +104,16 @@ jobs:
105104
uses: actions/cache@v3
106105
with:
107106
path: ${{ env.R_LIBS_USER }}
108-
key: ${{ env.cache-version }}-${{ runner.os }}-biocversion-devel-r-devel-${{ hashFiles('.github/depends.Rds') }}
109-
restore-keys: ${{ env.cache-version }}-${{ runner.os }}-biocversion-devel-r-devel-
107+
key: ${{ env.cache-version }}-${{ runner.os }}-biocversion-devel-${{ hashFiles('.github/depends.Rds') }}
108+
restore-keys: ${{ env.cache-version }}-${{ runner.os }}-biocversion-devel-
110109

111110
- name: Cache R packages on Linux
112111
if: "!contains(github.event.head_commit.message, '/nocache') && runner.os == 'Linux' "
113112
uses: actions/cache@v3
114113
with:
115114
path: /home/runner/work/_temp/Library
116-
key: ${{ env.cache-version }}-${{ runner.os }}-biocversion-devel-r-devel-${{ hashFiles('.github/depends.Rds') }}
117-
restore-keys: ${{ env.cache-version }}-${{ runner.os }}-biocversion-devel-r-devel-
115+
key: ${{ env.cache-version }}-${{ runner.os }}-biocversion-devel-${{ hashFiles('.github/depends.Rds') }}
116+
restore-keys: ${{ env.cache-version }}-${{ runner.os }}-biocversion-devel-
118117

119118
- name: Install Linux system dependencies
120119
if: runner.os == 'Linux'
@@ -155,11 +154,6 @@ jobs:
155154
remotes::install_cran("BiocManager")
156155
shell: Rscript {0}
157156

158-
- name: Set BiocVersion
159-
run: |
160-
BiocManager::install(version = "${{ matrix.config.bioc }}", ask = FALSE, force = TRUE)
161-
shell: Rscript {0}
162-
163157
- name: Install dependencies pass 1
164158
run: |
165159
## Try installing the package dependencies in steps. First the local
@@ -301,7 +295,7 @@ jobs:
301295
if: failure()
302296
uses: actions/upload-artifact@master
303297
with:
304-
name: ${{ runner.os }}-biocversion-devel-r-devel-results
298+
name: ${{ runner.os }}-biocversion-devel-results
305299
path: check
306300

307301
## Note that DOCKER_PASSWORD is really a token for your dockerhub

0 commit comments

Comments
 (0)