Adapt Pandoc action to new macOS installer

Closes #715
r-lib · Mar 29, 2023 · 91e3ef2 · 91e3ef2
1 parent 4376fa2
commit 91e3ef2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/setup-pandoc/lib/setup-pandoc.js b/setup-pandoc/lib/setup-pandoc.js
@@ -87,7 +87,8 @@ exports.getPandoc = getPandoc;
 function installPandocMac(version) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        const fileName = util.format("pandoc-%s-macOS.pkg", version);
+        const is_new_macos_installer = compare(version, "3.1.2", ">=") ? true : false;
+        const fileName = is_new_macos_installer ? util.format("pandoc-%s-x86_64-macOS.pkg", version) : util.format("pandoc-%s-macOS.pkg", version);
         const downloadUrl = util.format("https://github.com/jgm/pandoc/releases/download/%s/%s", version, fileName);
         let downloadPath;
         try {

diff --git a/setup-pandoc/src/setup-pandoc.ts b/setup-pandoc/src/setup-pandoc.ts
@@ -48,7 +48,10 @@ export function getPandoc(version: string): Promise<void> {
 }
 
 async function installPandocMac(version: string): Promise<void> {
-  const fileName = util.format("pandoc-%s-macOS.pkg", version);
+  // Since 3.1.2, Pandoc uses cabal instead of stack to build the macOS binary.
+  const is_new_macos_installer = compare(version, "3.1.2", ">=") ? true : false;
+  const fileName = is_new_macos_installer ? util.format("pandoc-%s-x86_64-macOS.pkg", version) : util.format("pandoc-%s-macOS.pkg", version);
+
   const downloadUrl = util.format(
     "https://github.com/jgm/pandoc/releases/download/%s/%s",
     version,