diff --git a/inno-setup/index.js b/inno-setup/index.js index 86442bfc..6984e4f8 100644 --- a/inno-setup/index.js +++ b/inno-setup/index.js @@ -6,12 +6,8 @@ var __importStar = (this && this.__importStar) || function (mod) { result["default"] = mod; return result; }; -var __importDefault = (this && this.__importDefault) || function (mod) { - return (mod && mod.__esModule) ? mod : { "default": mod }; -}; Object.defineProperty(exports, "__esModule", { value: true }); const core = __importStar(require("@actions/core")); -const path_1 = __importDefault(require("path")); const lib_1 = require("./lib"); async function run() { const issPath = core.getInput('path', { required: true }); @@ -22,7 +18,7 @@ async function run() { .map(x => `/D${x.trim()}`); } const installerOutput = await lib_1.makeInstaller(issPath, defines); - core.setOutput("installer-path", path_1.default.join(installerOutput, "install.exe")); + core.setOutput("installer-path", installerOutput); } run().catch(err => { console.error(err.stack); diff --git a/inno-setup/index.ts b/inno-setup/index.ts index f3ebe59e..7b8d5233 100644 --- a/inno-setup/index.ts +++ b/inno-setup/index.ts @@ -14,7 +14,7 @@ async function run() { const installerOutput = await makeInstaller(issPath, defines) - core.setOutput("installer-path", path.join(installerOutput, "install.exe")) + core.setOutput("installer-path", installerOutput) } run().catch(err => { diff --git a/inno-setup/lib.js b/inno-setup/lib.js index b4b96f7b..b367a2d2 100644 --- a/inno-setup/lib.js +++ b/inno-setup/lib.js @@ -12,6 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) { Object.defineProperty(exports, "__esModule", { value: true }); const exec = __importStar(require("@actions/exec")); const tmp_1 = __importDefault(require("tmp")); +const path_1 = __importDefault(require("path")); const shared_1 = require("../shared"); const ISCC_PATH = `"C:\\Program Files (x86)\\Inno Setup 6\\ISCC.exe"`; async function makeInstaller(issPath, defines = []) { @@ -24,6 +25,6 @@ async function makeInstaller(issPath, defines = []) { await exec.exec(`${ISCC_PATH} ${signCmd}`, [ "/Qp", `/O${installerOutput}`, ...defines, issPath ]); - return installerOutput; + return path_1.default.join(installerOutput, "install.exe"); } exports.makeInstaller = makeInstaller; diff --git a/inno-setup/lib.ts b/inno-setup/lib.ts index a564aebc..4f61d0ff 100644 --- a/inno-setup/lib.ts +++ b/inno-setup/lib.ts @@ -1,5 +1,6 @@ import * as exec from "@actions/exec" import tmp from "tmp" +import path from "path" import { DIVVUN_PFX, secrets } from "../shared" @@ -19,5 +20,5 @@ export async function makeInstaller(issPath: string, defines: string[] = []): Pr "/Qp", `/O${installerOutput}`, ...defines, issPath ]) - return installerOutput + return path.join(installerOutput, "install.exe") } diff --git a/keyboard/deploy/index.ts b/keyboard/deploy/index.ts index d78d8533..67ba2778 100644 --- a/keyboard/deploy/index.ts +++ b/keyboard/deploy/index.ts @@ -111,14 +111,7 @@ async function run() { throw new Error("artifact url is null; this is a logic error.") } - fs.writeFileSync("./payload.toml", payloadMetadata, "utf8") - - const isDeploying = shouldDeploy() || core.getInput('force-deploy'); - - if (!isDeploying) { - core.warning("Not deploying; ending.") - return - } + fs.writeFileSync("./metadata.toml", payloadMetadata, "utf8") await PahkatUploader.upload(artifactPath, artifactUrl, "./metadata.toml", repoPackageUrl) } diff --git a/speller/bundle/index.js b/speller/bundle/index.js index 7f126019..bb2dc711 100644 --- a/speller/bundle/index.js +++ b/speller/bundle/index.js @@ -76,6 +76,8 @@ async function run() { return code; }) .write("./install.iss"); + core.debug("generated install.iss:"); + core.debug(builder.build()); const payloadPath = await lib_1.makeInstaller("./install.iss"); core.setOutput("payload-path", payloadPath); } diff --git a/speller/bundle/index.ts b/speller/bundle/index.ts index 06608ede..40ecfcc9 100644 --- a/speller/bundle/index.ts +++ b/speller/bundle/index.ts @@ -97,6 +97,9 @@ async function run() { }) .write("./install.iss") + core.debug("generated install.iss:") + core.debug(builder.build()) + const payloadPath = await makeInstaller("./install.iss") core.setOutput("payload-path", payloadPath) } else if (spellerType == SpellerType.MacOS) { diff --git a/speller/deploy/index.js b/speller/deploy/index.js index 9c90a4ba..4ad64b4f 100644 --- a/speller/deploy/index.js +++ b/speller/deploy/index.js @@ -80,7 +80,7 @@ async function run() { if (payloadMetadata == null) { throw new Error("Payload is null; this is a logic error."); } - fs_1.default.writeFileSync("./payload.toml", payloadMetadata, "utf8"); + fs_1.default.writeFileSync("./metadata.toml", payloadMetadata, "utf8"); if (platform == null) { throw new Error("Platform is null; this is a logic error."); } diff --git a/speller/deploy/index.ts b/speller/deploy/index.ts index 71f6e50b..033f0f12 100644 --- a/speller/deploy/index.ts +++ b/speller/deploy/index.ts @@ -104,7 +104,7 @@ async function run() { throw new Error("Payload is null; this is a logic error.") } - fs.writeFileSync("./payload.toml", payloadMetadata, "utf8") + fs.writeFileSync("./metadata.toml", payloadMetadata, "utf8") if (platform == null) { throw new Error("Platform is null; this is a logic error.")