Skip to content

Commit

Permalink
pak requires > R 3.5.0 now
Browse files Browse the repository at this point in the history
Two reasons, one is that pkgbuild and pkgdepends use
```r
on.exit(..., after = ...)
```
which needs R 3.5.x. Two is that the repository is over
1GB, which is the GitHub Pages limit, so we need to make
it a bit smaller.
  • Loading branch information
gaborcsardi committed Jul 19, 2023
1 parent 1832fb7 commit f3721de
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 29 deletions.
1 change: 0 additions & 1 deletion .github/workflows/linux-builder-containers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ jobs:
- { r: '4.0' }
- { r: '3.6' }
- { r: '3.5' }
- { r: '3.4' }

steps:

Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ jobs:
- name: Install R
run: |
sudo rig add 3.4
sudo rig add 3.5
sudo rig add 3.6
sudo rig add 4.0
Expand Down Expand Up @@ -165,7 +164,6 @@ jobs:
# We use the pre-installed R 4.1.3 + Rtools40 for now, to speed this up
- name: Install R and RTools
run: |
rig add 3.4
rig add 3.5
rig add 3.6
rig add 4.0
Expand Down Expand Up @@ -209,7 +207,6 @@ jobs:
- { r: '4.0', platform: 'linux/amd64' }
- { r: '3.6', platform: 'linux/amd64' }
- { r: '3.5', platform: 'linux/amd64' }
- { r: '3.4', platform: 'linux/amd64' }

steps:

Expand Down Expand Up @@ -286,7 +283,6 @@ jobs:
- { r: '4.0', platform: 'linux/arm64' }
- { r: '3.6', platform: 'linux/arm64' }
- { r: '3.5', platform: 'linux/arm64' }
- { r: '3.4', platform: 'linux/arm64' }

steps:

Expand Down
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ LazyData: true
ByteCompile: true
RoxygenNote: 7.2.3.9000
Depends:
R (>= 3.2)
R (>= 3.5)
Imports:
tools,
utils
Expand Down
8 changes: 4 additions & 4 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,11 @@ This is supported for the following systems:

| OS | CPU | R version |
|--------------------|---------|-------------------|
| Linux | x86_64 | R 3.4.0 - R-devel |
| Linux | aarch64 | R 3.4.0 - R-devel |
| macOS High Sierra+ | x86_64 | R 3.4.0 - R-devel |
| Linux | x86_64 | R 3.5.0 - R-devel |
| Linux | aarch64 | R 3.5.0 - R-devel |
| macOS High Sierra+ | x86_64 | R 3.5.0 - R-devel |
| macOS Big Sur+ | aarch64 | R 4.1.0 - R-devel |
| Windows | x86_64 | R 3.4.0 - R-devel |
| Windows | x86_64 | R 3.5.0 - R-devel |

For macOS we only support the official CRAN R build.
Other builds, e.g.
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -243,11 +243,11 @@ This is supported for the following systems:

| OS | CPU | R version |
|--------------------|---------|-------------------|
| Linux | x86_64 | R 3.4.0 - R-devel |
| Linux | aarch64 | R 3.4.0 - R-devel |
| macOS High Sierra+ | x86_64 | R 3.4.0 - R-devel |
| Linux | x86_64 | R 3.5.0 - R-devel |
| Linux | aarch64 | R 3.5.0 - R-devel |
| macOS High Sierra+ | x86_64 | R 3.5.0 - R-devel |
| macOS Big Sur+ | aarch64 | R 4.1.0 - R-devel |
| Windows | x86_64 | R 3.4.0 - R-devel |
| Windows | x86_64 | R 3.5.0 - R-devel |

For macOS we only support the official CRAN R build. Other builds, e.g.
Homebrew R, are not supported.
Expand Down
38 changes: 24 additions & 14 deletions tests/testthat/test-repo.R
Original file line number Diff line number Diff line change
Expand Up @@ -24,25 +24,30 @@ test_that("Old URL", {
tsts <- read.table(stringsAsFactors = FALSE, header = TRUE, textConnection("
pkg_type rver
mac.binary.big-sur-arm64 4.1.2
mac.binary.big-sur-arm64 4.2.0
mac.binary.el-capitan 3.4.4
mac.binary.big-sur-arm64 4.2.3
mac.binary.big-sur-arm64 4.3.1
mac.binary.big-sur-arm64 4.4.0
mac.binary.el-capitan 3.5.3
mac.binary.el-capitan 3.6.3
mac.binary 4.0.5
mac.binary 4.1.2
mac.binary 4.2.0
win.binary 3.4.4
mac.binary 4.2.3
mac.binary 4.3.1
mac.binary 4.4.0
win.binary 3.5.3
win.binary 3.6.3
win.binary 4.0.5
win.binary 4.1.2
win.binary 4.2.0
source 3.4.4
win.binary 4.2.3
win.binary 4.3.1
win.binary 4.4.0
source 3.5.3
source 3.6.3
source 4.0.5
source 4.1.2
source 4.2.0
source 4.2.3
source 4.3.1
source 4.4.0
"))

for (i in seq_len(nrow(tsts))) {
Expand All @@ -67,28 +72,33 @@ test_that("New URL", {

tsts <- read.table(stringsAsFactors = FALSE, header = TRUE, textConnection("
pkg_type os arch rver branch
source linux-gnu x86_64 3.4.4 all
source linux-gnu x86_64 3.5.3 all
source linux-gnu x86_64 3.6.3 all
source linux-gnu x86_64 4.0.5 all
source linux-gnu x86_64 4.1.2 all
source linux-gnu x86_64 4.2.0 all
source linux-gnu x86_64 4.2.3 all
source linux-gnu x86_64 4.3.1 all
source linux-gnu x86_64 4.4.0 all
source linux-musl x86_64 4.1.2 all
source linux-gnu aarch64 4.1.2 devel
win.binary mingw32 x86_64 3.4.4 all
win.binary mingw32 x86_64 3.5.3 all
win.binary mingw32 x86_64 3.6.3 all
win.binary mingw32 x86_64 4.0.5 all
win.binary mingw32 x86_64 4.1.2 all
win.binary mingw32 x86_64 4.2.0 all
mac.binary.el-capitan darwin15.6.0 x86_64 3.4.4 all
win.binary mingw32 x86_64 4.2.3 all
win.binary mingw32 x86_64 4.3.1 all
win.binary mingw32 x86_64 4.4.0 all
mac.binary.el-capitan darwin15.6.0 x86_64 3.5.3 all
mac.binary.el-capitan darwin15.6.0 x86_64 3.6.3 all
mac.binary darwin17.0 x86_64 4.0.5 all
mac.binary darwin17.0 x86_64 4.1.2 all
mac.binary darwin17.0 x86_64 4.2.0 all
mac.binary darwin17.0 x86_64 4.2.3 all
mac.binary darwin17.0 x86_64 4.3.1 all
mac.binary darwin17.0 x86_64 4.4.0 all
mac.binary.big-sur-arm64 darwin20 aarch64 4.1.2 all
mac.binary.big-sur-arm64 darwin20 aarch64 4.2.0 all
mac.binary.big-sur-arm64 darwin20 aarch64 4.2.3 all
mac.binary.big-sur-arm64 darwin20 aarch64 4.3.1 all
mac.binary.big-sur-arm64 darwin20 aarch64 4.4.0 all
"))

for (i in seq_len(nrow(tsts))) {
Expand Down
2 changes: 1 addition & 1 deletion tools/build/linux/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

# ------------------------------------------------------------------------

RVERSIONS ?= 3.4 3.5 3.6 4.0 4.1 4.2
RVERSIONS ?= 3.5 3.6 4.0 4.1 4.2 4.3 4.4

# ------------------------------------------------------------------------

Expand Down

0 comments on commit f3721de

Please sign in to comment.