Re-enable worker termination test on MS Windows for R (>= 4.5.0) [#6]

futureverse · Jun 18, 2024 · d7488c6 · d7488c6
1 parent e625b19
commit d7488c6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pkgdown/_pkgdown.yml.rsp b/pkgdown/_pkgdown.yml.rsp
@@ -18,7 +18,7 @@ url: https://<%= pkg %>.futureverse.org
 home:
   links:
   - text: Roadmap/Milestones
-    href: https://github.com/HenrikBengtsson/<%= pkg %>/milestones
+    href: https://github.com/<%= gsub("(^.*:|[.]git$)", "", subset(gert::git_remote_list(), name == "origin")$url) %>/milestones
   - text: The Futureverse Project
     href: https://www.futureverse.org/
   - text: Futureverse User Forum

diff --git a/tests/mirai_cluster,worker-termination.R b/tests/mirai_cluster,worker-termination.R
@@ -14,7 +14,8 @@ stopifnot(free == 2L)
 ## Don't test on MS Windows, because that will leave behind a
 ## stray Rscript<hexcode> file, which 'R CMD check --as-cran'
 ## will complain about. /HB 2024-04-12
-if (.Platform$OS.type != "windows") {
+## This have been fixed in R-devel ("4.5.0") /HB 2024-06-18
+if (.Platform$OS.type != "windows" || getRversion() >= "4.5.0") {
   ## Force R worker to quit
   f <- future({ tools::pskill(pid = Sys.getpid()) })
   res <- tryCatch(value(f), error = identity)