fix: 上传缓存目录不再污染仓库
miniprogram-ci 的 SummerCompiler 用 path.join("", md5(projectPath + "|summer"))
建编译缓存,得到的是相对路径,会创建在进程工作目录下。上传子进程此前继承
API 进程的工作目录,于是每次上传都在 apps/api 下留下一个 32 位十六进制空目录。
把上传子进程的工作目录固定到 MINIAPP_UPLOAD_WORKSPACE(默认系统临时目录),
缓存随之落在临时目录,仓库保持干净;projectPath 一直是绝对路径,行为不受影响。
用真实 ensureCacheDir 验证目录落在临时工作目录,并断言仓库内不再新增缓存目录。
This commit is contained in:
1 parent
ac3f433ee6
commit
53713e5935
4 files changed
+147
-41
No files matched your search
@@ -0,0 +1,83 @@
|
||||
import assert from "node:assert/strict";
|
||||
import { existsSync, readdirSync, rmSync } from "node:fs";
|
||||
import { mkdir } from "node:fs/promises";
|
||||
import { createRequire } from "node:module";
|
||||
import os from "node:os";
|
||||
import path from "node:path";
|
||||
import { test } from "node:test";
|
||||
import { fileURLToPath } from "node:url";
|
||||
import { miniappUploadWorkspace, runMiniAppUpload } from "../src/modules/admin/miniapp-upload.js";
|
||||
|
||||
const repositoryRoot = fileURLToPath(new URL("../../..", import.meta.url));
|
||||
const hex32 = /^[0-9a-f]{32}$/;
|
||||
|
||||
function strayCacheDirectories(directory: string): string[] {
|
||||
return readdirSync(directory).filter((name) => hex32.test(name));
|
||||
}
|
||||
|
||||
test("上传工作目录位于系统临时目录,不会落在仓库内", () => {
|
||||
const workspace = miniappUploadWorkspace();
|
||||
assert.ok(workspace.startsWith(os.tmpdir()), workspace);
|
||||
assert.ok(!workspace.startsWith(repositoryRoot), workspace);
|
||||
assert.equal(miniappUploadWorkspace("relative/dir"), path.resolve("relative/dir"));
|
||||
});
|
||||
|
||||
test("miniprogram-ci 的相对路径缓存目录落在临时工作目录而不是仓库", async () => {
|
||||
const workspace = miniappUploadWorkspace();
|
||||
await mkdir(workspace, { recursive: true });
|
||||
const createSummer = createRequire(import.meta.url).resolve(
|
||||
"miniprogram-ci/dist/modules/createSummer.js",
|
||||
);
|
||||
const { summerCompilerFactory } = (await import(createSummer)) as {
|
||||
summerCompilerFactory: {
|
||||
project: unknown;
|
||||
ensureCacheDir: () => string;
|
||||
};
|
||||
};
|
||||
const projectPath = path.join(repositoryRoot, "apps/taro/dist/linjing-editorial/weapp");
|
||||
const before = strayCacheDirectories(path.join(repositoryRoot, "apps/api"));
|
||||
|
||||
// ensureCacheDir 用相对路径 mkdirSync,创建位置取决于进程工作目录,
|
||||
// 这里用真实实现验证:工作目录设为上传工作目录后,目录就落在临时目录里。
|
||||
const originalCwd = process.cwd();
|
||||
let created = "";
|
||||
try {
|
||||
summerCompilerFactory.project = { projectPath };
|
||||
process.chdir(workspace);
|
||||
created = summerCompilerFactory.ensureCacheDir();
|
||||
} finally {
|
||||
process.chdir(originalCwd);
|
||||
}
|
||||
|
||||
try {
|
||||
assert.match(created, hex32);
|
||||
assert.ok(existsSync(path.join(workspace, created)));
|
||||
assert.deepEqual(
|
||||
strayCacheDirectories(path.join(repositoryRoot, "apps/api")),
|
||||
before,
|
||||
"仓库内不应新增 miniprogram-ci 缓存目录",
|
||||
);
|
||||
} finally {
|
||||
if (created) rmSync(path.join(workspace, created), { recursive: true, force: true });
|
||||
}
|
||||
});
|
||||
|
||||
test("上传会在临时工作目录下启动,失败也不会在仓库留下目录", async () => {
|
||||
const workspace = miniappUploadWorkspace();
|
||||
const before = strayCacheDirectories(path.join(repositoryRoot, "apps/api"));
|
||||
await assert.rejects(() =>
|
||||
runMiniAppUpload(
|
||||
{
|
||||
projectPath: path.join(repositoryRoot, "apps/taro/dist/linjing-editorial/weapp"),
|
||||
appid: "wxtest",
|
||||
privateKey: "not-a-pem",
|
||||
version: "1",
|
||||
desc: "test",
|
||||
robot: 1,
|
||||
},
|
||||
30_000,
|
||||
),
|
||||
);
|
||||
assert.ok(existsSync(workspace));
|
||||
assert.deepEqual(strayCacheDirectories(path.join(repositoryRoot, "apps/api")), before);
|
||||
});
|
||||
Reference in new issue
Block a user