setup-r win: need explicit gs dependency install first

r-lib · Mar 25, 2024 · a83de20 · a83de20
1 parent 0dce027
commit a83de20
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/setup-r/lib/installer.js b/setup-r/lib/installer.js
@@ -597,8 +597,8 @@ function acquireQpdfWindows() {
             yield io.mv(dlpath, path.join(tempDirectory, "Ghostscipt.app.nupkg"));
             dlpath = yield tc.downloadTool("https://github.com/r-lib/actions/releases/download/sysreqs/qpdf.nupkg");
             yield io.mv(dlpath, path.join(tempDirectory, "qpdf.nupkg"));
+            yield exec.exec("choco", ["install", "autohotkey.portable", "--source", tempDirectory]);
             yield exec.exec("choco", ["install", "Ghostscript.app", "qpdf", "--source", tempDirectory]);
-            ;
         }));
     });
 }

diff --git a/setup-r/src/installer.ts b/setup-r/src/installer.ts
@@ -569,10 +569,14 @@ async function acquireQpdfWindows() {
     await io.mv(dlpath, path.join(tempDirectory, "Ghostscipt.app.nupkg"));
     dlpath = await tc.downloadTool("https://github.com/r-lib/actions/releases/download/sysreqs/qpdf.nupkg");
     await io.mv(dlpath, path.join(tempDirectory, "qpdf.nupkg"));
+    await exec.exec(
+      "choco",
+      ["install", "autohotkey.portable", "--source", tempDirectory]
+    );
     await exec.exec(
       "choco",
       ["install", "Ghostscript.app", "qpdf", "--source", tempDirectory]
-    );;
+    );
   })
 }