fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-26 18:58:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Desktop: Build and Sign Mac and Windows Bundles in CI (#3728)

Browse Source 
* Desktop: Build and Sign Mac and Windows Bundles in CI

* Desktop: Remove unnecessary CEF files from Windows Bundle

* Desktop: Use a temp file for license generation on Windows to avoid PowerShell modifying stdout
This commit is contained in:
Timon
2026-02-06 13:37:07 +00:00
committed by GitHub
parent 5efa81df85
commit acab171bc5
5 changed files with 376 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/vite.config.ts
+30 -9
View File
@@ -2,6 +2,7 @@
import { spawnSync } from "child_process";
import fs from "fs";
import os from "os";
import path from "path";
import { svelte } from "@sveltejs/vite-plugin-svelte";
@@ -298,12 +299,32 @@ function generateRustLicenses(): LicenseInfo[] {
try {
// Call `cargo about` in the terminal to generate the license information for Rust crates.
// The `about.hbs` file is written so it generates a valid JavaScript array expression which we evaluate below.
const { stdout, stderr, status } = spawnSync("cargo", ["about", "generate", "about.hbs"], {
cwd: path.join(__dirname, ".."),
encoding: "utf8",
shell: true,
windowsHide: true, // Hide the terminal on Windows
});
const { licenses, status, stderr } = (() => {
// On Windows, we have to write the output to a temporary file because of powershell's handling of stdout.
if (os.platform() === "win32") {
const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "graphite-licenses-"));
const licensesFile = path.join(tmpDir, "licenses.js");
const { status, stderr } = spawnSync("cargo", ["about", "generate", "about.hbs", "-o", licensesFile], {
cwd: path.join(__dirname, ".."),
encoding: "utf8",
shell: true,
windowsHide: true, // Hide the terminal on Windows
});
const licenses = fs.existsSync(licensesFile) ? fs.readFileSync(licensesFile, "utf8") : "";
return { licenses, status, stderr };
} else {
const { stdout, status, stderr } = spawnSync("cargo", ["about", "generate", "about.hbs"], {
cwd: path.join(__dirname, ".."),
encoding: "utf8",
shell: true,
});
return { licenses: stdout, status, stderr };
}
})();
// If the command failed, print the error message and exit early.
if (status !== 0) {
@@ -316,8 +337,8 @@ function generateRustLicenses(): LicenseInfo[] {
// Make sure the output starts with this expected label, which lets us know the file generated with expected output.
// We don't want to eval an error message or something else, so we fail early if that happens.
if (!stdout.trim().startsWith("GENERATED_BY_CARGO_ABOUT:")) {
console.error("Unexpected output from cargo-about", stdout);
if (!licenses.trim().startsWith("GENERATED_BY_CARGO_ABOUT:")) {
console.error("Unexpected output from cargo-about", licenses);
return [];
}
@@ -325,7 +346,7 @@ function generateRustLicenses(): LicenseInfo[] {
// Security-wise, eval() isn't any worse than require(), but it's able to work without a temporary file.
// We call eval indirectly to avoid a warning as explained here: <https://esbuild.github.io/content-types/#direct-eval>.
const indirectEval = eval;
const licensesArray = indirectEval(stdout) as LicenseInfo[];
const licensesArray = indirectEval(licenses) as LicenseInfo[];
// Remove the HTML character encoding caused by Handlebars.
const rustLicenses = (licensesArray || []).map(