Skip to content

Commit 19359ea

Browse files
authored
Merge pull request #57 from stack-wuh/refactor/20261012-refactor-release-smoke-single-implementation
20261012-refactor-release-smoke-single-implementation
2 parents 77a4e50 + 5b07bd7 commit 19359ea

3 files changed

Lines changed: 25 additions & 10 deletions

File tree

‎scripts/check-release-smoke.mjs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,13 @@ function staticChecks () {
122122
function materialize () {
123123
const where = 'offline-smoke'
124124
const pkgv = JSON.parse(readFileSync(join(root, 'package.json'), 'utf8')).version
125-
const asset = join(root, 'dist', 'shadow-dev-workflow-v' + pkgv + '.tar.gz')
125+
const work = resolve(matTmp || mkdtempSync(join(tmpdir(), 'rel-smoke-')))
126126
const bash = resolveBash()
127127
if (!bash) { warns.push('SMOKE_MATERIALIZE_DEFERRED offline-smoke: 本机无可信 bash(resolve-bash 拒绝 WSL 入口桩),离线腿未执行,不计入一致'); return }
128-
const pk = spawnSync(process.execPath, ['scripts/pack.mjs'], { cwd: root, encoding: 'utf8' })
128+
const pk = spawnSync(process.execPath, ['scripts/pack.mjs', '--out', join(work, 'dist')], { cwd: root, encoding: 'utf8' })
129129
if (pk.status !== 0) { bad('SMOKE_PACK_FAILED', where, '本地打包失败 rc=' + pk.status + ':' + String(pk.stderr || '').split(String.fromCharCode(10)).filter((x) => x && !/npm warn/.test(x)).slice(0, 2).join(' / ').slice(0, 200)); return }
130+
const asset = join(work, 'dist', 'shadow-dev-workflow-v' + pkgv + '.tar.gz')
130131
if (!existsSync(asset)) { bad('SMOKE_PACK_FAILED', where, '本地产物不存在:' + asset); return }
131-
const work = resolve(matTmp || mkdtempSync(join(tmpdir(), 'rel-smoke-')))
132132
const r = spawnSync(bash.path, [smokePath, '--from', asset.replace(/\\/g, '/'), '--work', work.replace(/\\/g, '/')], { cwd: root, encoding: 'utf8' })
133133
const out = String(r.stdout || '') + String(r.stderr || '')
134134
if (process.platform === 'win32' && (out.includes('bash -c tar') || out.includes('ENOENT') || out.includes('not recognized'))) { warns.push('SMOKE_MATERIALIZE_DEFERRED offline-smoke: 本机不物化——CLI 的 bash -c tar 收到反斜杠绝对路径(execution-layer 缺陷,已登记 shadow-dev-cli);CI(Linux/macOS)跑实断言'); return }

‎scripts/pack.mjs‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,16 @@
22
// 打包发布产物:dist/shadow-dev-workflow-v<version>.tar.gz,解包得到 shadow-dev-workflow/ 目录
33
import { execFileSync } from 'node:child_process'
44
import { cpSync, mkdirSync, readFileSync, rmSync } from 'node:fs'
5-
import { dirname, join } from 'node:path'
5+
import { dirname, join, resolve } from 'node:path'
66
import { fileURLToPath } from 'node:url'
77

88
const root = dirname(dirname(fileURLToPath(import.meta.url)))
99
const { version } = JSON.parse(readFileSync(join(root, 'package.json'), 'utf8'))
10-
const dist = join(root, 'dist')
10+
const argOut = (() => { const i = process.argv.indexOf('--out'); return i >= 0 ? process.argv[i + 1] : null })()
11+
// 并发安全(INV-6):离线冒烟门与 pack 测试同时跑时不得争用同一个 dist——并行 runner 上会 EBUSY: resource busy or locked
12+
const dist = argOut ? resolve(argOut) : join(root, 'dist')
13+
// tar 必须用相对路径(Git Bash 会把 D:\... 读成远程主机:路径),所以 --out 时把 tar 的 cwd 换到 out 的父目录,让 dist/... 仍是相对路径
14+
const tarCwd = argOut ? dirname(dist) : root
1115
const staging = join(dist, 'staging')
1216

1317
// 运行必需集:hook fallback 依赖 scripts/install-cli.sh;.codex-plugin/ 与 .agents/ 随产物分发供 Codex 宿主消费;排除 test/shadow-docs/changes 等开发产物
@@ -22,7 +26,7 @@ for (const f of [...FILES, ...DIRS]) {
2226
const artifact = join(dist, `shadow-dev-workflow-v${version}.tar.gz`)
2327
try {
2428
// tar 必须用相对路径:Git Bash 的 tar 会把 "D:\..." 解析成"远程主机:路径"
25-
execFileSync('tar', ['-czf', `dist/shadow-dev-workflow-v${version}.tar.gz`, '-C', 'dist/staging', 'shadow-dev-workflow'], { cwd: root })
29+
execFileSync('tar', ['-czf', `dist/shadow-dev-workflow-v${version}.tar.gz`, '-C', 'dist/staging', 'shadow-dev-workflow'], { cwd: tarCwd })
2630
rmSync(staging, { recursive: true, force: true })
2731
console.log(artifact)
2832
} catch {

‎shadow-docs/changes/20261012-refactor-release-smoke-single-implementation/brief.md‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"knowledge/release-artifact-pipeline.md",
1414
"package.json",
1515
"scripts/check-release-smoke.mjs",
16+
"scripts/pack.mjs",
1617
"scripts/release-smoke.sh",
1718
"shadow-docs/INDEX.md",
1819
"shadow-docs/changes/20261012-refactor-release-smoke-single-implementation/brief.md",
@@ -22,8 +23,8 @@
2223
"repository": null,
2324
"issue": null,
2425
"issueUrl": null,
25-
"pullRequest": 56,
26-
"pullRequestUrl": "https://github.com/stack-wuh/shadow-dev-workflow/pull/56"
26+
"pullRequest": 57,
27+
"pullRequestUrl": "https://github.com/stack-wuh/shadow-dev-workflow/pull/57"
2728
},
2829
"review": {
2930
"conclusion": "passed",
@@ -32,8 +33,8 @@
3233
},
3334
"workflow": {
3435
"operation": null,
35-
"checkpoint": "pr:56",
36-
"planHash": "9f1e903510575f25d387b26ccf891b17d3ea4bfddc57ecf51f8ffddbf9e8573d",
36+
"checkpoint": "pr:57",
37+
"planHash": "7781144698c516b85f62b354f3bff2345bd16bb9f6a54cf187eddd107c657b63",
3738
"updatedAt": null,
3839
"lastError": null,
3940
"release": {
@@ -50,6 +51,14 @@
5051
"message": "refactor(release-chain): 冒烟收敛为唯一实现,yml 只剩一行委派",
5152
"title": "[refactor] 发布冒烟只留一份实现:yml 与本机门调同一个脚本",
5253
"body": "连续两次发版各炸一处(v7.0.0 借错字段、v7.0.1 变量写成反引号),结构性原因是同一段断言存在两份实现:CI 跑 yml 内联那份,本机门跑自己那份,改坏一份另一份毫无反应,于是「本机绿 + PR 绿 + 链红」可以同时成立。#55 用 failure-as-fixture 给第二份实现打补丁,本 change 消灭「两份」本身。 · 做法:断言唯一实现落在 scripts/release-smoke.sh(五条断言、双入口 --release 与 --from、set -euo pipefail、失败带 x 前缀可定位行号);publish-release.yml 冒烟步骤只剩一行 bash 调用;门改为对唯一实现做静态对账(SMOKE_NOT_DELEGATED、SMOKE_INLINE_ASSERTION、SMOKE_ASSERTION_MISSING 用 7 条特征串守住条目、SMOKE_BACKTICK_SUBST、SMOKE_UNKNOWN_FIELD)并自检自身不得驱动 CLI(SMOKE_DUPLICATION),离线腿改为直接调用脚本、退出码即判据。 · 验证:node --test test/release-smoke.test.mjs 10/10;npm run ci 权威通道退出码 0,六门 fail=0,npm test 30/30;离线腿实跑输出 OK materialized root=... skills=9 与 materialized=1 deferred=0——本机绿从此等价于 CI 将跑同一份代码。 · 诚实记录:本轮执行者自伤 7 次(多层转义、String.replace 的美元符后向引用、try/catch 吞掉 ReferenceError、把 resolveBash 返回对象当字符串、自指命中),根因与收敛纪律已写入 knowledge/contract-probe.md 新增条「AI 生成源码的转义纪律」,brief 结果段逐条留痕。 · 交付事实:v7.0.0 与 v7.0.1 两个发版载体仍未归档,等本 change 合入后再发一版让 publish-release 首次跑绿。"
54+
},
55+
"commit": {
56+
"files": [
57+
"scripts/check-release-smoke.mjs",
58+
"scripts/pack.mjs",
59+
"shadow-docs/changes/20261012-refactor-release-smoke-single-implementation/brief.md"
60+
],
61+
"message": "fix(release-chain): pack 增加 --out 隔离产物目录,修 main 上 EBUSY 并行争用"
5362
}
5463
},
5564
"knowledge": {
@@ -136,3 +145,5 @@ v7.0.0 与 v7.0.1 连续两次发版各炸一个新点:第一次是 `workflow
136145
2. `shadow-dev-cli` 清单(跨上下文后继):`--body-file/--message-file`;`release execute` 不校验 review passed(实证:review 未落时照样开出 PR #54);`archive` 要求 `verifiedCommit == HEAD` 过严(本轮第三次撞上,均需回 main 重跑 review)。
137146
3. `dist/` 仍未进 `.gitignore`:本 change 的离线腿会稳定产出 `dist`,当前靠显式文件列表提交侥幸不带入版本库。
138147
4. v7.0.0 / v7.0.1 两个发版载体仍未归档:等本 change 合入后再发一版,`publish-release` 首次跑绿才同时归档三者。
148+
149+
6. **main 红灯归因(本 change 内发现并修复)**:`quality-gate push/main` 在 `e383212` 判红,Windows runner 报 `EBUSY: resource busy or locked, unlink dist/shadow-dev-workflow-v7.0.1.tar.gz`——根因是 #55 让门的离线腿与 `pack.test.mjs` 争用同一个 `dist/` 目录,而 `node --test` 并行执行测试文件。修复:`scripts/pack.mjs` 增加 `--out`(默认行为不变,tar 仍用相对路径但 `cwd` 换到 out 的父目录),门改为打包进各自隔离的 `<work>/dist`,并新增 INV-6 禁止争用共享产物目录。观察点:本机 `pack --out` 产出隔离 tarball,`npm run ci` 退出码 0 且 `tests 30 / pass 30`。

0 commit comments

Comments
 (0)