Skip to content

Commit 3749fa4

Browse files
committed
ci: fix witness batch env/ordering regressions
Three witnesses failed in CI though green locally: - triage-quickinfo-emptyparity and triage-refs-exportspec read /tmp/tnb-sweep-fixtures, which sweep-ls-throws generates — but the workflow ran the witness batch before the sweep. Move sweep-ls-throws ahead of the witness batch. - triage-orphan-leak read its stock path from STOCK_TSSERVER while CI (and every other witness) uses STOCK_TSSERVER_PATH; it now honors STOCK_TSSERVER_PATH first.
1 parent 2ca0247 commit 3749fa4

2 files changed

Lines changed: 13 additions & 10 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,17 @@ jobs:
9191
- name: Link TNB into volar
9292
run: ln -sfn "$GITHUB_WORKSPACE" "$RUNNER_TEMP/volar/typescript-native-bridge"
9393

94+
- name: sweep-ls-throws
95+
env:
96+
VOLAR_ROOT: ${{ runner.temp }}/volar
97+
run: |
98+
# Runs before the witness batch: it regenerates /tmp/tnb-sweep-fixtures
99+
# that triage-quickinfo-emptyparity and triage-refs-exportspec read.
100+
TNB_TRACE_THROW=1 TNB_TRACE_THROW_FILE=/tmp/tnb-throw-ci.jsonl \
101+
node tools/sweep-ls-throws.mjs 2>&1 | tee /tmp/tnb-sweep-ci.log
102+
grep -q "correlated throw hits: 0" /tmp/tnb-sweep-ci.log \
103+
|| { echo "sweep correlated hits != 0"; exit 1; }
104+
94105
- name: Regression witnesses
95106
env:
96107
VOLAR_ROOT: ${{ runner.temp }}/volar
@@ -135,15 +146,6 @@ jobs:
135146
exit 1
136147
fi
137148
138-
- name: sweep-ls-throws
139-
env:
140-
VOLAR_ROOT: ${{ runner.temp }}/volar
141-
run: |
142-
TNB_TRACE_THROW=1 TNB_TRACE_THROW_FILE=/tmp/tnb-throw-ci.jsonl \
143-
node tools/sweep-ls-throws.mjs 2>&1 | tee /tmp/tnb-sweep-ci.log
144-
grep -q "correlated throw hits: 0" /tmp/tnb-sweep-ci.log \
145-
|| { echo "sweep correlated hits != 0"; exit 1; }
146-
147149
- name: sourcefile-guard
148150
env:
149151
VOLAR_ROOT: ${{ runner.temp }}/volar

‎tools/triage-orphan-leak.mjs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ const repoRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..'
2626
const volarRoot = resolveVolarRoot();
2727
const tnbPath = process.env.TNB_ORPHAN_TSSERVER
2828
?? path.join(volarRoot, 'node_modules/typescript/lib/tsserver.js');
29-
const stockPath = process.env.STOCK_TSSERVER
29+
const stockPath = process.env.STOCK_TSSERVER_PATH
30+
?? process.env.STOCK_TSSERVER
3031
?? '/tmp/stock-ts-p3/package/lib/tsserver.js';
3132

3233
const EXIT_MS = 2000;

0 commit comments

Comments
 (0)