From a9e5a19aee43737cda60e63d33fb84556a80fc34 Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Tue, 18 Feb 2025 13:42:01 -0800 Subject: [PATCH 1/2] Add a test for runtime.txt with full R version specified Catching possible errors as reported in https://discourse.jupyter.org/t/error-in-mybinder-org-there-is-no-package-called-irkernel/32478/13. The other tests only specify x.y, not x.y.z --- tests/r/r4.3.2-rspm/install.R | 1 + tests/r/r4.3.2-rspm/runtime.txt | 1 + tests/r/r4.3.2-rspm/verify | 13 +++++++++++++ 3 files changed, 15 insertions(+) create mode 100644 tests/r/r4.3.2-rspm/install.R create mode 100644 tests/r/r4.3.2-rspm/runtime.txt create mode 100755 tests/r/r4.3.2-rspm/verify diff --git a/tests/r/r4.3.2-rspm/install.R b/tests/r/r4.3.2-rspm/install.R new file mode 100644 index 000000000..f609959ef --- /dev/null +++ b/tests/r/r4.3.2-rspm/install.R @@ -0,0 +1 @@ +install.packages("digest") diff --git a/tests/r/r4.3.2-rspm/runtime.txt b/tests/r/r4.3.2-rspm/runtime.txt new file mode 100644 index 000000000..cdd616ea8 --- /dev/null +++ b/tests/r/r4.3.2-rspm/runtime.txt @@ -0,0 +1 @@ +r-4.3.2-2024-01-10 diff --git a/tests/r/r4.3.2-rspm/verify b/tests/r/r4.3.2-rspm/verify new file mode 100755 index 000000000..c5cb0ee87 --- /dev/null +++ b/tests/r/r4.3.2-rspm/verify @@ -0,0 +1,13 @@ +#!/usr/bin/env Rscript +library('digest') + +# Fail if version is not 4.3 +print(version) +if (!(version$major == "4" && version$minor == "3")) { + quit("yes", 1) +} + +# The date we have chosen should give us an rspm mirror +if (!(startsWith(options()$repos["CRAN"], "https://packagemanager.posit.co"))) { + quit("yes", 1) +} From 3304921cdd7dc43bb2a9a02932235bd043d48d80 Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Thu, 20 Feb 2025 14:55:08 -0800 Subject: [PATCH 2/2] Ask for very specific version --- tests/r/r4.3.2-rspm/verify | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/r/r4.3.2-rspm/verify b/tests/r/r4.3.2-rspm/verify index c5cb0ee87..c46a402ac 100755 --- a/tests/r/r4.3.2-rspm/verify +++ b/tests/r/r4.3.2-rspm/verify @@ -1,9 +1,9 @@ #!/usr/bin/env Rscript library('digest') -# Fail if version is not 4.3 +# Fail if version is not 4.3.2 print(version) -if (!(version$major == "4" && version$minor == "3")) { +if (!(version$major == "4" && version$minor == "3.2")) { quit("yes", 1) }