Skip to content

Commit

Permalink
Merge pull request #10811 from quarto-dev/quart-bld/remove-signing
Browse files Browse the repository at this point in the history
  • Loading branch information
cderv authored Sep 19, 2024
2 parents fa772d3 + 5b0edd2 commit c96fd24
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 97 deletions.
53 changes: 2 additions & 51 deletions package/src/windows/installer.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import { info, warning } from "../../../src/deno_ral/log.ts";
import { info } from "../../../src/deno_ral/log.ts";
import { basename, dirname, join } from "../../../src/deno_ral/path.ts";
import { emptyDirSync, ensureDirSync, existsSync, moveSync } from "fs/mod.ts";

import { Configuration } from "../common/config.ts";
import { runCmd } from "../util/cmd.ts";
import { download, getEnv, unzip } from "../util/utils.ts";
import { signtool } from "./signtool.ts";
import { download, unzip } from "../util/utils.ts";
import { execProcess } from "../../../src/core/process.ts";
import { copySync } from "fs/copy.ts";

Expand All @@ -25,16 +24,6 @@ export async function makeInstallerWindows(configuration: Configuration) {
const candleCmd = join(wixDir, "candle");
const lightCmd = join(wixDir, "light");

// Extract the PFX file that will be used for signing
const encodedPfx = getEnv("QUARTO_WIN_PFX", "");
const pfxPw = getEnv("QUARTO_WIN_PFX_PW", "");
const sign = encodedPfx.length > 0 && pfxPw.length > 0;
if (!sign) {
warning(
"No Signing information available in environment, skipping signing",
);
}

// Download tools, if necessary
if (
!existsSync(workingDir) || !existsSync(wixDir) ||
Expand Down Expand Up @@ -70,33 +59,6 @@ export async function makeInstallerWindows(configuration: Configuration) {
const archToolsPath = join(workingToolsPath, "x86_64");
copySync(configuration.directoryInfo.pkgWorking.root, workingDistPath);

if (sign) {
info("Signing application files");

const filesToSign = [
{ file: join(workingBinPath, "quarto.exe") },
{ file: join(archToolsPath, "deno.exe") },
{ file: join(archToolsPath, "esbuild.exe") },
{ file: join(workingToolsPath, "pandoc.exe") },
{
file: join(
archToolsPath,
"dart-sass",
"src",
"dart.exe",
),
},
{ file: join(archToolsPath, "deno_dom", "plugin.dll") },
{ file: join(workingBinPath, "quarto.js") },
];
await signtool(
filesToSign,
encodedPfx,
pfxPw,
workingDir,
);
}

// Create a zip file
info("Creating zip installer");
const zipInput = join(workingDistPath, "*");
Expand Down Expand Up @@ -180,17 +142,6 @@ export async function makeInstallerWindows(configuration: Configuration) {

Deno.env.delete("QUARTO_INSTALLER_VERSION");

// Use signtool to sign the MSI
if (sign) {
info("Signing installer");
await signtool(
[{ file: lightOutput, desc: "Quarto CLI" }],
encodedPfx,
pfxPw,
workingDir,
);
}

info(
`Moving ${lightOutput} to ${configuration.directoryInfo.out}`,
);
Expand Down
46 changes: 0 additions & 46 deletions package/src/windows/signtool.ts

This file was deleted.

0 comments on commit c96fd24

Please sign in to comment.