mirror of
https://github.com/morluto/rea.git
synced 2026-11-21 14:05:49 +00:00
fix(desktop): apply APT architecture modifiers to explicit source restrictions (#12573)
* fix(desktop): apply APT architecture modifiers to explicit source restrictions * fix(desktop): export architecture-independent APT packages --------- Co-authored-by: morluto <76467478+morluto@users.noreply.github.com>
This commit is contained in:
1 parent
cddaef83ae
commit
184ed690d6
6 files changed
+109
-10
No files matched your search
@@ -35,6 +35,7 @@ import type {
|
||||
DesktopApplicationCapture,
|
||||
} from "../../domain/desktop/desktopCapture.js";
|
||||
import { renderBuildBundle } from "../../domain/desktop/appBuild.js";
|
||||
import { parseOneLineSources } from "../../domain/desktop/aptRepositories.js";
|
||||
import { readDownloadInstall } from "./DesktopExportInstall.js";
|
||||
import { exportDesktopApplication } from "./DesktopApplicationExport.js";
|
||||
import {
|
||||
@@ -1585,6 +1586,43 @@ describe("exportDesktopApplication of a program in another package", () => {
|
||||
});
|
||||
});
|
||||
|
||||
it("exports APT's architecture-independent package after all explicit architectures were removed", async () => {
|
||||
const [entry] = parseOneLineSources(
|
||||
"deb [arch=arm64 arch-=arm64] https://downloads.typora.io/linux ./",
|
||||
"vendor.list",
|
||||
);
|
||||
if (entry === undefined) throw new Error("APT source did not parse");
|
||||
expect(entry.architectures).toEqual(["all"]);
|
||||
const recorded = vendorCapture(VERIFIED_KEY);
|
||||
const installed = recorded.application.package;
|
||||
const repositories = installed.apt_repositories?.map((repository) => ({
|
||||
...repository,
|
||||
architectures: [...entry.architectures],
|
||||
}));
|
||||
const exportFor = (architecture: string) =>
|
||||
exportVendorCapture({
|
||||
...recorded,
|
||||
application: {
|
||||
...recorded.application,
|
||||
package: { ...installed, architecture, apt_repositories: repositories },
|
||||
},
|
||||
});
|
||||
|
||||
const admitted = await exportFor("all");
|
||||
if (admitted.result instanceof Error) throw admitted.result;
|
||||
expect(
|
||||
await readFile(
|
||||
join(admitted.directory, "envs/typora/typora_app.py"),
|
||||
"utf8",
|
||||
),
|
||||
).toContain('AptSource(apt="https://downloads.typora.io/linux"');
|
||||
|
||||
const refused = await exportFor("arm64");
|
||||
expect(refused.result).toMatchObject({ _tag: "AnalysisInputError" });
|
||||
expect(JSON.stringify(refused.result)).toContain("it serves only all");
|
||||
expect(await exists(refused.directory)).toBe(false);
|
||||
});
|
||||
|
||||
describe("exportDesktopApplication from a vendor repository", () => {
|
||||
it("copies the verified key, declares the repository and library packages, and turns the sandbox off", async () => {
|
||||
const { result, directory } = await exportVendorCapture(
|
||||
|
||||
Reference in new issue
Block a user