r-lib · gaborcsardi · Aug 2, 2024 · Jul 31, 2024 · Jul 31, 2024 · Aug 2, 2024
diff --git a/NEWS.md b/NEWS.md
@@ -14,6 +14,9 @@
   unchanged, on all R versions. To avoid using a P3M snapshot on R 3.6.x,
   set the `RSPM_PIN_3_6` environment variable to `false`.
 
+* `[setup-r]` now installs the x86_64 build of R on arm64 macOS, if there
+  is no arm64 build available for this R version (#883).
+
 * Example blogdown, bookdown, document, pr-commands and render-markdown
   workflows now correctly have write permission to repository contents
   (#874, @remlapmot).

diff --git a/setup-r/dist/index.js b/setup-r/dist/index.js
diff --git a/setup-r/dist/index.js.map b/setup-r/dist/index.js.map
diff --git a/setup-r/src/installer.ts b/setup-r/src/installer.ts
@@ -756,9 +756,18 @@ export async function determineVersion(version: string): Promise<IRVersion> {
   if (ARCH) {
     url = url + "/" + ARCH;
   }
-  let tags = (await rest.get<IRVersion>(url)).result;
+  var tags = (await rest.get<IRVersion>(url)).result;
 
   if (!tags) {
+    // if arm mac, try intel as well
+    if (OS == "mac" && ARCH == "arm64") {
+      let url2: string =
+	"https://api.r-hub.io/rversions/resolve/" + version + "/" + OS;
+      tags = (await rest.get<IRVersion>(url2)).result;
+      if (!tags) {
+        throw new Error(`Failed to resolve R version ${version} at ${url} and ${url2}`);
+      }
+    }
     throw new Error(`Failed to resolve R version ${version} at ${url}.`);
   }