Merge fc529f1 into 9611ec5

r-lib · Apr 1, 2023 · 730d281 · 730d281
2 parents 9611ec5 + fc529f1
commit 730d281
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/setup-r-dependencies/action.yaml b/setup-r-dependencies/action.yaml
@@ -81,7 +81,16 @@ runs:
           # Dependency resolution
           cat("::group::Dependency resolution\n")
           cat("os-version=", sessionInfo()$running, "\n", file = Sys.getenv("GITHUB_OUTPUT"), sep = "", append = TRUE)
-          cat("r-version=", if (grepl("development", rv <- R.Version()$version.string)) as.character(getRversion()) else rv, "\n", file = Sys.getenv("GITHUB_OUTPUT"), sep = "", append = TRUE)
+          r_version <-
+            if (grepl("development", R.version.string)) {
+              pdf(tempfile())
+              ge_ver <- attr(recordPlot(), "engineVersion")
+              dev.off()
+              paste0("R version ", getRversion(), " (ge:", ge_ver, "; iid:", .Internal(internalsID()), ")")
+            } else {
+              R.version.string
+            }
+          cat("r-version=", r_version, "\n", file = Sys.getenv("GITHUB_OUTPUT"), sep = "", append = TRUE)
           needs <- sprintf("Config/Needs/%s", strsplit("${{ inputs.needs }}", "[[:space:],]+")[[1]])
           deps <- strsplit("${{ inputs.packages }}", "[[:space:],]+")[[1]]
           extra_deps <- strsplit("${{ inputs.extra-packages }}", "[[:space:],]+")[[1]]