Skip to content

Commit 4d4f005

Browse files
jakebaileyjakebailey
committed
Merge branch 'main' into tsgo-port
2 parents 0ab90cf + 637d574 commit 4d4f005

31 files changed

Lines changed: 1183 additions & 179 deletions

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

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55

66
permissions:
77
contents: read
8+
id-token: write
89

910
# Ensure scripts are run with pipefail. See:
1011
# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#exit-codes-and-error-action-preference
@@ -15,19 +16,22 @@ defaults:
1516
jobs:
1617
build:
1718
runs-on: ubuntu-latest
19+
environment:
20+
name: azure
21+
deployment: false
1822

1923
steps:
20-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
24+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2125
with:
22-
token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
23-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
26+
persist-credentials: false
27+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
2428
with:
2529
node-version: 'lts/*'
2630

2731
- name: Configure Git, Run Tests, Update Baselines, Apply Fixes
2832
run: |
29-
git config user.email "typescriptbot@microsoft.com"
30-
git config user.name "TypeScript Bot"
33+
git config user.email "290192711+typescript-automation[bot]@users.noreply.github.com"
34+
git config user.name "typescript-automation[bot]"
3135
npm ci
3236
git rm -r --quiet tests/baselines/reference
3337
npx hereby runtests-parallel --ci --fix || true
@@ -37,4 +41,27 @@ jobs:
3741
git add ./tests/baselines/reference
3842
git diff --cached
3943
git commit -m "Update Baselines, Applied Lint Fixes, and/or Formatted"
40-
git push
44+
- uses: azure/login@532459ea530d8321f2fb9bb10d1e0bcf23869a43 # v3.0.0
45+
with:
46+
client-id: ${{ vars.AZURE_CLIENT_ID }}
47+
tenant-id: ${{ vars.AZURE_TENANT_ID }}
48+
subscription-id: ${{ vars.AZURE_SUBSCRIPTION_ID }}
49+
- name: Create GitHub App token
50+
id: app-token
51+
uses: microsoft/create-github-app-token-via-key-vault@5ba0d436e9c3cac52feff4d1f2f66f9698ce4a2d # v1
52+
with:
53+
client-id: ${{ vars.TYPESCRIPT_AUTOMATION_GITHUB_APP_CLIENT_ID }}
54+
key-id: ${{ vars.TYPESCRIPT_AUTOMATION_GITHUB_APP_KEY_ID }}
55+
owner: microsoft
56+
repositories: TypeScript
57+
permission-contents: write
58+
- name: Configure git for GitHub App token
59+
shell: bash
60+
env:
61+
GITHUB_APP_TOKEN: ${{ steps.app-token.outputs.token }}
62+
run: |
63+
set -euo pipefail
64+
basic_auth="$(node -e 'process.stdout.write(Buffer.from("x-access-token:" + process.env.GITHUB_APP_TOKEN).toString("base64"))')"
65+
echo "::add-mask::$basic_auth"
66+
git config --local http.https://github.com/.extraheader "AUTHORIZATION: basic ${basic_auth}"
67+
- run: git push

‎.github/workflows/ci.yml‎

Lines changed: 27 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ jobs:
109109
name: Test Node ${{ matrix.config.node-version }} on ${{ matrix.config.os }}${{ (!matrix.config.bundle && ' with --no-bundle') || '' }}
110110

111111
steps:
112-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
112+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
113113
- name: Use node version ${{ matrix.config.node-version }}
114-
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
114+
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
115115
with:
116116
node-version: ${{ matrix.config.node-version }}
117117
check-latest: true
@@ -144,8 +144,8 @@ jobs:
144144
contents: read
145145

146146
steps:
147-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
148-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
147+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
148+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
149149
with:
150150
node-version: 'lts/*'
151151
- run: npm ci
@@ -154,12 +154,12 @@ jobs:
154154
run: npm test -- --no-lint --coverage
155155

156156
- name: Upload coverage artifact
157-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
157+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
158158
with:
159159
name: coverage
160160
path: coverage
161161

162-
- uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
162+
- uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
163163
with:
164164
use_oidc: ${{ !(github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork) }}
165165
disable_search: true
@@ -169,8 +169,8 @@ jobs:
169169
runs-on: ubuntu-latest
170170

171171
steps:
172-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
173-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
172+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
173+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
174174
with:
175175
node-version: 'lts/*'
176176
- run: npm ci
@@ -182,8 +182,8 @@ jobs:
182182
runs-on: ubuntu-latest
183183

184184
steps:
185-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
186-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
185+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
186+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
187187
with:
188188
node-version: 'lts/*'
189189
- run: npm ci
@@ -195,13 +195,13 @@ jobs:
195195
runs-on: ubuntu-latest
196196

197197
steps:
198-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
199-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
198+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
199+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
200200
with:
201201
node-version: 'lts/*'
202202
- run: npm ci
203203

204-
- uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
204+
- uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
205205
with:
206206
path: ~/.cache/dprint
207207
key: ${{ runner.os }}-dprint-${{ hashFiles('package-lock.json', '.dprint.jsonc') }}
@@ -211,30 +211,12 @@ jobs:
211211
- name: Check formatting
212212
run: npx dprint check
213213

214-
browser-integration:
215-
if: ${{ github.event_name != 'merge_group' }}
216-
217-
runs-on: ubuntu-latest
218-
219-
steps:
220-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
221-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
222-
with:
223-
node-version: 'lts/*'
224-
- run: npm ci
225-
226-
- name: Installing browsers
227-
run: npx playwright install --with-deps
228-
229-
- name: Validate the browser can import TypeScript
230-
run: npx hereby test-browser-integration
231-
232214
typecheck:
233215
runs-on: ubuntu-latest
234216

235217
steps:
236-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
237-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
218+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
219+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
238220
with:
239221
node-version: 'lts/*'
240222
- run: npm ci
@@ -246,9 +228,9 @@ jobs:
246228
runs-on: ubuntu-latest
247229

248230
steps:
249-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
231+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
250232

251-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
233+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
252234
with:
253235
node-version: 'lts/*'
254236
- run: |
@@ -289,16 +271,16 @@ jobs:
289271
if: github.event_name == 'pull_request'
290272

291273
steps:
292-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
274+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
293275
with:
294276
path: pr
295277

296-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
278+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
297279
with:
298280
path: base
299281
ref: ${{ github.base_ref }}
300282

301-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
283+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
302284
with:
303285
node-version: 'lts/*'
304286
- run: |
@@ -336,8 +318,8 @@ jobs:
336318
runs-on: ubuntu-latest
337319

338320
steps:
339-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
340-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
321+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
322+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
341323
with:
342324
node-version: 'lts/*'
343325
- run: npm ci
@@ -352,8 +334,8 @@ jobs:
352334
runs-on: ubuntu-latest
353335

354336
steps:
355-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
356-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
337+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
338+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
357339
with:
358340
node-version: 'lts/*'
359341
- run: npm ci
@@ -373,8 +355,8 @@ jobs:
373355
runs-on: ubuntu-latest
374356

375357
steps:
376-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
377-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
358+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
359+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
378360
with:
379361
node-version: 'lts/*'
380362
- run: npm ci
@@ -410,7 +392,7 @@ jobs:
410392
411393
- name: Upload baseline diff artifact
412394
if: ${{ failure() && steps.check-baselines.conclusion == 'failure' }}
413-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
395+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
414396
with:
415397
name: fix_baselines.patch
416398
path: fix_baselines.patch
@@ -424,7 +406,6 @@ jobs:
424406
- lint
425407
- knip
426408
- format
427-
- browser-integration
428409
- typecheck
429410
- smoke
430411
- package-size

‎.github/workflows/close-issues.yml‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77

88
permissions:
99
contents: read
10+
id-token: write
1011

1112
# Ensure scripts are run with pipefail. See:
1213
# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#exit-codes-and-error-action-preference
@@ -17,15 +18,36 @@ defaults:
1718
jobs:
1819
close-issues:
1920
runs-on: ubuntu-latest
21+
environment:
22+
name: azure
23+
deployment: false
2024
if: github.repository == 'microsoft/TypeScript'
2125
permissions:
2226
contents: read # Apparently required to create issues
27+
id-token: write
2328
issues: write
2429

2530
steps:
31+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
32+
with:
33+
persist-credentials: false
34+
- uses: azure/login@532459ea530d8321f2fb9bb10d1e0bcf23869a43 # v3.0.0
35+
with:
36+
client-id: ${{ vars.AZURE_CLIENT_ID }}
37+
tenant-id: ${{ vars.AZURE_TENANT_ID }}
38+
subscription-id: ${{ vars.AZURE_SUBSCRIPTION_ID }}
39+
- name: Create GitHub App token
40+
id: app-token
41+
uses: microsoft/create-github-app-token-via-key-vault@5ba0d436e9c3cac52feff4d1f2f66f9698ce4a2d # v1
42+
with:
43+
client-id: ${{ vars.TYPESCRIPT_AUTOMATION_GITHUB_APP_CLIENT_ID }}
44+
key-id: ${{ vars.TYPESCRIPT_AUTOMATION_GITHUB_APP_KEY_ID }}
45+
owner: microsoft
46+
repositories: TypeScript
47+
permission-issues: write
2648
- name: Close issues
2749
env:
28-
GH_TOKEN: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
50+
GH_TOKEN: ${{ steps.app-token.outputs.token }}
2951
REPO: ${{ github.repository }}
3052
run: |
3153
DATE=$(date --date='2 days ago' --iso-8601)

‎.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@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
45+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4646

4747
# Initializes the CodeQL tools for scanning.
4848
- name: Initialize CodeQL
49-
uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
49+
uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
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@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
59+
uses: github/codeql-action/autobuild@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
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@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
73+
uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2

‎.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@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
19-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
18+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
19+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
2020
- run: npm ci
2121
# pull dprint caches before network access is blocked
2222
- run: npx hereby check-format || true

0 commit comments

Comments
 (0)