Skip to content

Commit d3b1d96

Browse files
committed
Merge branch 'main' into tsgo-compat
2 parents d163960 + 0a74ec4 commit d3b1d96

33,527 files changed

Lines changed: 668797 additions & 269607 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
// Use 'postCreateCommand' to run commands after the container is created.
1717
"postCreateCommand": {
18-
"Configure Build Tools": "sudo corepack enable npm; sudo npm install -g hereby; npm ci",
18+
"Configure Build Tools": "sudo npm install -g hereby; npm ci",
1919
"Install pprof": "go install github.com/google/pprof@latest",
2020
"Install Graphviz": "sudo apt install graphviz"
2121
},

.github/workflows/accept-baselines-fix-lints.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
runs-on: ubuntu-latest
1818

1919
steps:
20-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
20+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2121
with:
2222
token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
23-
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
23+
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
2424
with:
2525
node-version: 'lts/*'
2626

.github/workflows/ci.yml

Lines changed: 46 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ on:
55
branches:
66
- main
77
- release-*
8+
- tsgo-port
89
pull_request:
910
branches:
1011
- main
1112
- release-*
13+
- tsgo-port
1214
merge_group:
1315
branches:
1416
- main
@@ -26,7 +28,7 @@ defaults:
2628
jobs:
2729
test:
2830
strategy:
29-
fail-fast: false
31+
fail-fast: ${{ github.event_name == 'merge_group' }}
3032
matrix:
3133
config:
3234
# Main builds
@@ -46,6 +48,7 @@ jobs:
4648
- os: ubuntu-latest
4749
node-version: '22'
4850
bundle: true
51+
skip: ${{ github.event_name == 'merge_group' }}
4952
- os: windows-latest
5053
node-version: '22'
5154
bundle: true
@@ -58,6 +61,7 @@ jobs:
5861
- os: ubuntu-latest
5962
node-version: '20'
6063
bundle: true
64+
skip: ${{ github.event_name == 'merge_group' }}
6165
- os: windows-latest
6266
node-version: '20'
6367
bundle: true
@@ -70,6 +74,7 @@ jobs:
7074
- os: ubuntu-latest
7175
node-version: '18'
7276
bundle: true
77+
skip: ${{ github.event_name == 'merge_group' }}
7378
- os: windows-latest
7479
node-version: '18'
7580
bundle: true
@@ -82,6 +87,7 @@ jobs:
8287
- os: ubuntu-latest
8388
node-version: '16'
8489
bundle: true
90+
skip: ${{ github.event_name == 'merge_group' }}
8591
- os: windows-latest
8692
node-version: '16'
8793
bundle: true
@@ -117,9 +123,9 @@ jobs:
117123
name: Test Node ${{ matrix.config.node-version }} on ${{ matrix.config.os }}${{ (!matrix.config.bundle && ' with --no-bundle') || '' }}
118124

119125
steps:
120-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
126+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
121127
- name: Use node version ${{ matrix.config.node-version }}
122-
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
128+
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
123129
with:
124130
node-version: ${{ matrix.config.node-version }}
125131
check-latest: true
@@ -138,20 +144,20 @@ jobs:
138144
git diff --staged --exit-code
139145
140146
coverage:
141-
if: ${{ github.event_name != 'merge_group' }}
147+
if: ${{ github.event_name != 'merge_group' && github.ref != 'refs/heads/tsgo-port' }}
142148

143149
runs-on:
144150
- 'self-hosted'
145151
- '1ES.Pool=TypeScript-1ES-GitHub-Large'
146-
- '1ES.ImageOverride=mariner-2.0'
152+
- '1ES.ImageOverride=azure-linux-3'
147153

148154
permissions:
149155
id-token: write
150156
contents: read
151157

152158
steps:
153-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
154-
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
159+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
160+
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
155161
with:
156162
node-version: 'lts/*'
157163
- run: npm ci
@@ -160,12 +166,12 @@ jobs:
160166
run: npm test -- --no-lint --coverage
161167

162168
- name: Upload coverage artifact
163-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
169+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
164170
with:
165171
name: coverage
166172
path: coverage
167173

168-
- uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
174+
- uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
169175
with:
170176
use_oidc: ${{ !(github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork) }}
171177
disable_search: true
@@ -175,8 +181,8 @@ jobs:
175181
runs-on: ubuntu-latest
176182

177183
steps:
178-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
179-
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
184+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
185+
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
180186
with:
181187
node-version: 'lts/*'
182188
- run: npm ci
@@ -188,8 +194,8 @@ jobs:
188194
runs-on: ubuntu-latest
189195

190196
steps:
191-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
192-
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
197+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
198+
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
193199
with:
194200
node-version: 'lts/*'
195201
- run: npm ci
@@ -201,13 +207,13 @@ jobs:
201207
runs-on: ubuntu-latest
202208

203209
steps:
204-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
205-
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
210+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
211+
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
206212
with:
207213
node-version: 'lts/*'
208214
- run: npm ci
209215

210-
- uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
216+
- uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
211217
with:
212218
path: ~/.cache/dprint
213219
key: ${{ runner.os }}-dprint-${{ hashFiles('package-lock.json', '.dprint.jsonc') }}
@@ -218,11 +224,13 @@ jobs:
218224
run: npx dprint check
219225

220226
browser-integration:
227+
if: ${{ github.event_name != 'merge_group' }}
228+
221229
runs-on: ubuntu-latest
222230

223231
steps:
224-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
225-
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
232+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
233+
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
226234
with:
227235
node-version: 'lts/*'
228236
- run: npm ci
@@ -237,8 +245,8 @@ jobs:
237245
runs-on: ubuntu-latest
238246

239247
steps:
240-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
241-
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
248+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
249+
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
242250
with:
243251
node-version: 'lts/*'
244252
- run: npm ci
@@ -250,9 +258,9 @@ jobs:
250258
runs-on: ubuntu-latest
251259

252260
steps:
253-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
261+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
254262

255-
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
263+
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
256264
with:
257265
node-version: 'lts/*'
258266
- run: |
@@ -291,16 +299,16 @@ jobs:
291299
if: github.event_name == 'pull_request'
292300

293301
steps:
294-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
302+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
295303
with:
296304
path: pr
297305

298-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
306+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
299307
with:
300308
path: base
301309
ref: ${{ github.base_ref }}
302310

303-
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
311+
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
304312
with:
305313
node-version: 'lts/*'
306314
- run: |
@@ -316,24 +324,30 @@ jobs:
316324
working-directory: ./pr
317325

318326
- run: npm ci
327+
id: base-npm-ci
328+
continue-on-error: true
319329
working-directory: ./base
320330

321331
- run: npx hereby lkg
322332
working-directory: ./pr
323333

324334
- run: npx hereby lkg
335+
id: base-lkg
336+
continue-on-error: true
337+
if: ${{ steps.base-npm-ci.outcome == 'success' }}
325338
working-directory: ./base
326339

327340
- run: |
328341
echo "See $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID for more info."
329342
node ./pr/scripts/checkPackageSize.mjs ./base ./pr >> $GITHUB_STEP_SUMMARY
343+
if: ${{ steps.base-lkg.outcome == 'success' }}
330344
331345
misc:
332346
runs-on: ubuntu-latest
333347

334348
steps:
335-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
336-
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
349+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
350+
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
337351
with:
338352
node-version: 'lts/*'
339353
- run: npm ci
@@ -348,8 +362,8 @@ jobs:
348362
runs-on: ubuntu-latest
349363

350364
steps:
351-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
352-
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
365+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
366+
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
353367
with:
354368
node-version: 'lts/*'
355369
- run: npm ci
@@ -369,8 +383,8 @@ jobs:
369383
runs-on: ubuntu-latest
370384

371385
steps:
372-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
373-
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
386+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
387+
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
374388
with:
375389
node-version: 'lts/*'
376390
- run: npm ci
@@ -406,7 +420,7 @@ jobs:
406420
407421
- name: Upload baseline diff artifact
408422
if: ${{ failure() && steps.check-baselines.conclusion == 'failure' }}
409-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
423+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
410424
with:
411425
name: fix_baselines.patch
412426
path: fix_baselines.patch

.github/workflows/codeql.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ jobs:
4242

4343
steps:
4444
- name: Checkout repository
45-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
45+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4646

4747
# Initializes the CodeQL tools for scanning.
4848
- name: Initialize CodeQL
49-
uses: github/codeql-action/init@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
49+
uses: github/codeql-action/init@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
5050
with:
5151
config-file: ./.github/codeql/codeql-configuration.yml
5252
# Override language selection by uncommenting this and choosing your languages
@@ -56,7 +56,7 @@ jobs:
5656
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5757
# If this step fails, then you should remove it and run the build manually (see below).
5858
- name: Autobuild
59-
uses: github/codeql-action/autobuild@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
59+
uses: github/codeql-action/autobuild@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
6060

6161
# ℹ️ Command-line programs to run using the OS shell.
6262
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -70,4 +70,4 @@ jobs:
7070
# make release
7171

7272
- name: Perform CodeQL Analysis
73-
uses: github/codeql-action/analyze@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
73+
uses: github/codeql-action/analyze@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0

.github/workflows/copilot-setup-steps.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ jobs:
1515
# You can define any steps you want, and they will run before the agent starts.
1616
# If you do not check out your code, Copilot will do this for you.
1717
steps:
18-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
19-
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
18+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
19+
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
2020
- run: npm ci
2121
# pull dprint caches before network access is blocked
2222
- run: npx hereby check-format || true

.github/workflows/create-cherry-pick-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
if: github.repository == 'microsoft/TypeScript'
4848

4949
steps:
50-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
50+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5151
with:
5252
filter: blob:none # https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/
5353
fetch-depth: 0 # Default is 1; need to set to 0 to get the benefits of blob:none.

.github/workflows/error-deltas-watchdog.yaml

Lines changed: 0 additions & 45 deletions
This file was deleted.

0 commit comments

Comments
 (0)