open-source/qinglong
1
0
Fork 0
mirror of https://github.com/whyour/qinglong.git synced 2026-11-07 01:27:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove legacy SQLite compiler artifacts from migration bundles

Browse Source
This commit is contained in:
whyour
2026-10-23 14:04:42 +08:00
parent 49cec13fcd
commit ce2e396b3e
2 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/rebuild-migration-sqlite.cjs
+6 -3
View File
@@ -53,9 +53,12 @@ async function rebuildMigrationSqlite(root, {
assertArmv6Addon(stdout);
if (!lock.equals(await fs.readFile(path.join(root, 'pnpm-lock.yaml'))))
throw new Error('Migration SQLite rebuild changed the frozen lockfile');
// node-pre-gyp copied the addon to lib/binding; compiler objects are not
// needed on the small target device or in the transition download.
await fs.rm(path.join(rebuilt, 'build'), { recursive: true, force: true });
// node-pre-gyp copies the addon to lib/binding and then renames build to
// build-tmp-napi-v<N>. Both layouts contain compiler objects and an absolute
// node_gyp_bins/python3 link; none belongs in a portable runtime archive.
for (const name of await fs.readdir(rebuilt))
if (name === 'build' || /^build-tmp-napi-v\d+$/.test(name))
await fs.rm(path.join(rebuilt, name), { recursive: true, force: true });
console.log('Legacy bridge SQLite rebuilt and verified for ARMv6 hard-float');
return true;
}
test/back/migration-sqlite-armv6.test.cjs
+26
View File
@@ -62,6 +62,32 @@ test('uses frozen repair even when the legacy image has no optional node-gyp', a
assert.equal(await fs.readFile(root + '/pnpm-lock.yaml', 'utf8'), 'fixed legacy lock');
});
test('removes node-pre-gyp build directories and external compiler links while retaining the runtime addon', async (t) => {
const { root, runtime } = await fixture(t);
const sqlite = path.join(root, 'node_modules/sqlite3');
const addon = path.join(sqlite, 'lib/binding/napi-v6-linux-arm/node_sqlite3.node');
await fs.mkdir(path.dirname(addon), { recursive: true });
await fs.writeFile(addon, 'compiled ARM1176 addon');
const statics = path.join(root, 'static');
await fs.mkdir(statics);
const { inventory } = require('../../cli/src/internal/maintenance/platformBundle.cjs');
for (const name of ['build', 'build-tmp-napi-v3', 'build-tmp-napi-v6']) {
const directory = path.join(sqlite, name, 'node_gyp_bins');
await fs.mkdir(directory, { recursive: true });
await fs.symlink('/usr/bin/python3', path.join(directory, 'python3'));
}
await assert.rejects(inventory({ source: root, static: statics }), /Bundle link escapes/);
await rebuildMigrationSqlite(root, {
target, runtime,
repair: async () => {},
run: async () => ({ stdout: armv6 }),
});
assert.equal(await fs.readFile(addon, 'utf8'), 'compiled ARM1176 addon');
for (const name of ['build', 'build-tmp-napi-v3', 'build-tmp-napi-v6'])
await assert.rejects(fs.access(path.join(sqlite, name)), { code: 'ENOENT' });
await inventory({ source: root, static: statics });
});
for (const fault of ['runtime-package', 'headers', 'compiler', 'armv7-output', 'lock-change'])
test('fails closed for bridge rebuild fault: ' + fault, async (t) => {
const { root, runtime } = await fixture(t);