mirror of
https://github.com/QwenLM/qwen-code.git
synced 2026-10-31 11:42:35 +00:00
6b863adcac
* fix(vscode-ide-companion): make NOTICES.txt order-independent and retry release installs Sort notice entries by package name and version so reordering the companion's dependencies block (as the v0.24.4 release commit did) no longer rewrites every section of NOTICES.txt and fails the main-branch up-to-date check. NOTICES.txt is re-sorted to match; its line content is unchanged. Wrap both corepack pnpm install steps in the VS Code companion release workflow in the bounded retry e2e.yml already uses, so a registry connect timeout while corepack fetches pnpm no longer fails a release leg that a plain re-run passes. Fixes #12486 Fixes #12480 * fix(ci): run the release install retry under bash on windows-latest The build matrix has no default shell, so windows-latest would run the new bash retry loop under pwsh and fail every release leg there. * fix(ci): prefetch pnpm and cache the pnpm store in the companion release Fetch pnpm with corepack install under the same bounded retry before anything else invokes it, then restore the pnpm store through the repo's pnpm-store-cache action, as ci.yml and e2e.yml already do. The cache takes most dependency downloads off the registry on a hit; the install keeps its retry for cache misses. * fix(release): keep manifest layout when bumping versions pnpm version re-serializes every manifest it rewrites, sorting dependency blocks and dropping empty ones. The v0.24.4 bump moved @modelcontextprotocol/sdk inside the VS Code companion's dependencies, which reordered its generated NOTICES.txt and failed main CI. Snapshot the tracked manifests before the bump and write back the original text with only the top-level version replaced. This also reverts this branch's earlier NOTICES sorting and release workflow retry/cache changes. Fixes #12486 * fix(release): keep the version snapshot independent of git scripts/version.js built its pre-bump manifest snapshot with `git ls-files -- "*package.json"`, which exits 128 outside a git work tree. scripts/tests/release-versioning.test.js spawns the real script with cwd set to a fresh mkdtemp directory, so execSync threw before `pnpm version` ran and both cases failed the `expect(result.status).toBe(0)` assertion. Enumerate the root manifest plus the workspace globs through getWorkspacePackageJsonPaths instead. That matches the git-independent design the rest of the script already follows (both `pnpm version` calls pass --no-git-checks) and covers exactly the manifests the bump rewrites. Also copy the new scripts/keep-manifest-layout.js into the test fixture, since it is now part of version.js's import closure. Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com> Patrol-Run: qwen-pr-conflict/jmud0xfc6f0 * test(release): pin the manifest snapshot/restore wiring with raw text Every manifest comparison in this suite went through JSON.parse, so key order and a dropped empty dependency block were invisible to it: deleting the restore loop in scripts/version.js, moving the snapshot below the two `pnpm version` calls, or inverting its `updated !== original` guard all left it green. Perturb one coupled manifest that steps 6-8 never rewrite (packages/vscode-ide-companion) into the layout pnpm re-serializes -- the shape that reordered its generated NOTICES.txt and broke main in #12486 -- then assert its raw text afterwards equals that perturbed text with only the top-level version value replaced. The tree as committed is already in pnpm's order, so without the perturbation the assertion would be vacuous. Mutation-verified: all three mutants above now fail, on both it.each cases. Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com> Patrol-Run: qwen-pr-closeout/jmud8scl6ff --------- Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
32 lines
1.1 KiB
JavaScript
32 lines
1.1 KiB
JavaScript
/**
|
|
* @license
|
|
* Copyright 2026 Qwen Team
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
const TOP_LEVEL_VERSION = /^( {2}"version": )"[^"]*"/m;
|
|
|
|
/**
|
|
* Carry the version `pnpm version` wrote into the manifest text as it was
|
|
* before, so a release bump changes the version and nothing else.
|
|
*
|
|
* `pnpm version` re-serializes every manifest it touches: it sorts dependency
|
|
* blocks and drops empty ones. The v0.24.4 bump moved
|
|
* `@modelcontextprotocol/sdk` inside the VS Code companion's dependencies,
|
|
* which reordered its generated NOTICES.txt and failed main CI (#12486).
|
|
*
|
|
* @param {string} original - Manifest text before `pnpm version` ran
|
|
* @param {string} updated - Manifest text after `pnpm version` ran
|
|
* @returns {string} `original` with its top-level version replaced, or
|
|
* `updated` when the version cannot be located in `original`
|
|
*/
|
|
export function keepManifestLayout(original, updated) {
|
|
const { version } = JSON.parse(updated);
|
|
if (typeof version !== 'string' || !TOP_LEVEL_VERSION.test(original)) {
|
|
return updated;
|
|
}
|
|
return original.replace(
|
|
TOP_LEVEL_VERSION,
|
|
(_, prefix) => `${prefix}${JSON.stringify(version)}`,
|
|
);
|
|
}
|