Skip to content

Commit 6d2b738

Browse files
authored
Use built local on CI and not LKG (#29886)
* Use built local on CI and not LKG * Adjust function to remove need for assertions * Accept baseline diff to go back to local based baseline * Remove comment
1 parent 75101d4 commit 6d2b738

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

Jakefile.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const host = process.env.TYPESCRIPT_HOST || process.env.host || "node";
2424

2525
const defaultTestTimeout = 40000;
2626
const useBuilt =
27-
process.env.USE_BUILT === "true" ? true :
27+
(process.env.USE_BUILT === "true" || process.env.CI === "true") ? true :
2828
process.env.LKG === "true" ? false :
2929
false;
3030

src/compiler/core.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -1396,9 +1396,10 @@ namespace ts {
13961396

13971397
export function assign<T extends object>(t: T, ...args: (T | undefined)[]) {
13981398
for (const arg of args) {
1399-
for (const p in arg!) {
1400-
if (hasProperty(arg!, p)) {
1401-
t![p] = arg![p]; // TODO: GH#23368
1399+
if (arg === undefined) continue;
1400+
for (const p in arg) {
1401+
if (hasProperty(arg, p)) {
1402+
t[p] = arg[p];
14021403
}
14031404
}
14041405
}

tests/baselines/reference/api/tsserverlibrary.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8347,7 +8347,7 @@ declare namespace ts.server {
83478347
excludedFiles: ReadonlyArray<NormalizedPath>;
83488348
private typeAcquisition;
83498349
updateGraph(): boolean;
8350-
getExcludedFiles(): ReadonlyArray<NormalizedPath>;
8350+
getExcludedFiles(): readonly NormalizedPath[];
83518351
getTypeAcquisition(): TypeAcquisition;
83528352
setTypeAcquisition(newTypeAcquisition: TypeAcquisition): void;
83538353
}

0 commit comments

Comments
 (0)