Merge branch 'main' into feature/builder

r-lib · Jul 29, 2024 · a5801b5 · a5801b5
2 parents 4d7cf66 + 945abab
commit a5801b5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -26,8 +26,6 @@ jobs:
           - {os: macos-latest,   r: 'release'}
 
           - {os: windows-latest, r: 'release'}
-          # Use 3.6 to trigger usage of RTools35
-          - {os: windows-latest, r: '3.6'}
           # use 4.1 to check with rtools40's older compiler
           - {os: windows-latest, r: '4.1'}
 

diff --git a/R/solve.R b/R/solve.R
@@ -478,6 +478,7 @@ pkgplan_i_lp_latest_direct <- function(lp) {
       pkgs$type %in% c("cran", "bioc", "standard")
     )
     cand <- setdiff(cand, lp$ruled_out)
+    if (length(cand) == 0) next
     vers <- package_version(pkgs$version[cand])
     bad <- vers < max(vers)
     for (wh in cand[bad]) {
@@ -507,6 +508,7 @@ pkgplan_i_lp_latest_within_repo <- function(lp) {
   dups <- unique(key[duplicated(key)])
   for (dupkey in dups) {
     cand <- which (key == dupkey)
+    if (length(cand) == 0) next
     vers <- package_version(lp$pkgs$version[cand])
     bad <- vers < max(vers)
     for (wh in cand[bad]) {
@@ -601,6 +603,7 @@ pkgplan_i_lp_prefer_new_binaries <- function(lp) {
         pkgs$type %in% c("cran", "bioc", "standard")
     )
     whp <- setdiff(whp, lp$ruled_out)
+    if (length(whp) == 0) next
     v <- package_version(pkgs$version[whp])
     ruled_out <- c(ruled_out, whp[v != max(v)])
   }