Skip to content

Commit 26d2ab2

Browse files
authored
Merge pull request #334 from FredHutch/4.1
Make VISCtemplates require R >= 4.1.0 and drop R 4.0.4 from CI
2 parents 3a883b2 + 2f4b355 commit 26d2ab2

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

.github/workflows/R-CMD-check.yaml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ jobs:
2222
- {os: windows-latest, r: 'release'}
2323
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
2424
- {os: ubuntu-latest, r: 'release'}
25-
- {os: ubuntu-latest, r: '4.0.4', pandoc-version: '2.11.4'}
25+
- {os: ubuntu-latest, r: '4.4.2', pandoc-version: '3.2'}
26+
- {os: ubuntu-latest, r: '4.1.0', pandoc-version: '2.11.4'}
2627

2728
env:
2829
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
@@ -31,14 +32,14 @@ jobs:
3132
steps:
3233
- uses: actions/checkout@v4
3334

34-
- name: Setup statsrv pandoc
35-
if: ${{ matrix.config.r == '4.0.4' }}
35+
- name: Setup custom pandoc version
36+
if: ${{ matrix.config.pandoc-version != null }}
3637
uses: r-lib/actions/setup-pandoc@v2
3738
with:
3839
pandoc-version: ${{ matrix.config.pandoc-version }}
3940

40-
- name: Setup default pandoc
41-
if: ${{ matrix.config.r != '4.0.4' }}
41+
- name: Setup default pandoc version
42+
if: ${{ matrix.config.pandoc-version == null }}
4243
uses: r-lib/actions/setup-pandoc@v2
4344

4445
- name: Set up tinytex
@@ -53,15 +54,15 @@ jobs:
5354
5455
- name: Setup recent R
5556
uses: r-lib/actions/setup-r@v2
56-
if: ${{ matrix.config.r != '4.0.4' }}
57+
if: ${{ matrix.config.r != '4.1.0' && matrix.config.r != '4.4.2'}}
5758
with:
5859
r-version: ${{ matrix.config.r }}
5960
http-user-agent: ${{ matrix.config.http-user-agent }}
6061
use-public-rspm: true
6162

62-
- name: Setup R 4.0.4
63+
- name: Setup older R
6364
uses: r-lib/actions/setup-r@v2
64-
if: ${{ matrix.config.r == '4.0.4' }}
65+
if: ${{ matrix.config.r == '4.1.0' || matrix.config.r == '4.4.2'}}
6566
with:
6667
r-version: ${{ matrix.config.r }}
6768
cran: 'https://packagemanager.posit.co/cran/__linux__/noble/2024-04-19'

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Authors@R:
2525
email = "kmacphee@fredhutch.org")
2626
Description: The goal of VISCtemplates is to automate project setup provide a common easy-to-understand directory structure across analyses, provide consistency across reports in the same project/protocol, and provide consistency across reports analyzing data from the same assay.
2727
License: GPL-3 + file LICENSE
28-
Depends: R (>= 3.0)
28+
Depends: R (>= 4.1.0)
2929
Imports:
3030
fs,
3131
digest,

NEWS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Improvements for package contributors and maintainers
1818
* Remove empty "examples" in template study schema to avoid minor issues (#319)
1919
* Run test knits in a `callr` session to isolate Rmd library calls from main R process (#320)
2020
* Drop dependency on `DataPackageR` (#324)
21+
* VISCtemplates now depends on R >= 4.1.0 (#334)
2122

2223
# VISCtemplates 2.0.2
2324

0 commit comments

Comments
 (0)