Skip to content

Commit 5460495

Browse files
committed
Merge branch 'main' into fix-55653
2 parents 7ae2f07 + d0d4067 commit 5460495

File tree

703 files changed

+62781
-11980
lines changed

Some content is hidden

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

703 files changed

+62781
-11980
lines changed

.dprint.jsonc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
],
5252
// Note: if adding new languages, make sure settings.template.json is updated too.
5353
"plugins": [
54-
"https://plugins.dprint.dev/typescript-0.87.1.wasm",
54+
"https://plugins.dprint.dev/typescript-0.88.1.wasm",
5555
"https://plugins.dprint.dev/prettier-0.27.0.json@3557a62b4507c55a47d8cde0683195b14d13c41dda66d0f0b0e111aed107e2fe",
5656
"https://plugins.dprint.dev/json-0.17.4.wasm"
5757
]

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

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

19-
permissions:
20-
contents: write
21-
2219
steps:
2320
- uses: actions/checkout@v3
21+
with:
22+
token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
2423
- uses: actions/setup-node@v3
2524

2625
- name: Configure Git, Run Tests, Update Baselines, Apply Fixes

.github/workflows/ensure-related-repos-run-crons.yml

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

.github/workflows/new-release-branch.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,18 @@ jobs:
1717
build:
1818
runs-on: ubuntu-latest
1919

20-
permissions:
21-
contents: write
22-
2320
steps:
21+
- uses: actions/checkout@v4
22+
with:
23+
filter: blob:none # https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/
24+
fetch-depth: 0 # Default is 1; need to set to 0 to get the benefits of blob:none.
25+
token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
2426
- uses: actions/setup-node@v3
2527
- run: |
2628
npm --version
2729
# corepack enable npm
2830
npm install -g $(jq -r '.packageManager' < package.json)
2931
npm --version
30-
- uses: actions/checkout@v3
31-
with:
32-
fetch-depth: 5
3332
- run: |
3433
git checkout -b ${{ github.event.client_payload.branch_name }}
3534
sed -i -e 's/"version": ".*"/"version": "${{ github.event.client_payload.package_version }}"/g' package.json
@@ -38,10 +37,11 @@ jobs:
3837
sed -i -e 's/const versionMajorMinor = ".*"/const versionMajorMinor = "${{ github.event.client_payload.core_major_minor }}"/g' tests/baselines/reference/api/tsserverlibrary.d.ts
3938
sed -i -e 's/const version\(: string\)\{0,1\} = `${versionMajorMinor}.0-.*`/const version = `${versionMajorMinor}.0-${{ github.event.client_payload.core_tag || 'dev' }}`/g' src/compiler/corePublic.ts
4039
npm ci
40+
npm install # update package-lock.json to ensure the version bump is included
4141
npx hereby LKG
4242
npm test
4343
git diff
44-
git add package.json
44+
git add package.json package-lock.json
4545
git add src/compiler/corePublic.ts
4646
git add tests/baselines/reference/api/typescript.d.ts
4747
git add tests/baselines/reference/api/tsserverlibrary.d.ts

.github/workflows/rich-navigation.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ jobs:
2424
runs-on: windows-latest
2525

2626
steps:
27-
- uses: actions/checkout@v3
28-
with:
29-
fetch-depth: 5
27+
- uses: actions/checkout@v4
3028

3129
- uses: actions/setup-node@v3
3230

.github/workflows/set-version.yaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,12 @@ defaults:
1616
jobs:
1717
build:
1818
runs-on: ubuntu-latest
19-
20-
permissions:
21-
contents: write
22-
2319
steps:
24-
- uses: actions/setup-node@v3
2520
- uses: actions/checkout@v3
2621
with:
2722
ref: ${{ github.event.client_payload.branch_name }}
23+
token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
24+
- uses: actions/setup-node@v3
2825
- run: |
2926
npm --version
3027
# corepack enable npm
@@ -44,10 +41,11 @@ jobs:
4441
sed -i -e 's/const versionMajorMinor = ".*"/const versionMajorMinor = "${{ github.event.client_payload.core_major_minor }}"/g' tests/baselines/reference/api/tsserverlibrary.d.ts
4542
sed -i -e 's/const version\(: string\)\{0,1\} = .*;/const version = "${{ github.event.client_payload.package_version }}" as string;/g' src/compiler/corePublic.ts
4643
npm ci
44+
npm install # update package-lock.json to ensure the version bump is included
4745
npx hereby LKG
4846
npm test
4947
git diff
50-
git add package.json
48+
git add package.json package-lock.json
5149
git add src/compiler/corePublic.ts
5250
git add tests/baselines/reference/api/typescript.d.ts
5351
git add tests/baselines/reference/api/tsserverlibrary.d.ts

.github/workflows/sync-branch.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,14 @@ jobs:
2222
build:
2323
runs-on: ubuntu-latest
2424

25-
permissions:
26-
contents: write
27-
2825
steps:
2926
- uses: actions/setup-node@v3
30-
- uses: actions/checkout@v3
27+
- uses: actions/checkout@v4
3128
with:
3229
ref: ${{ github.event.inputs.branch_name || github.event.client_payload.branch_name }}
33-
fetch-depth: 0
34-
# This does a test post-merge and only pushes the result if the test succeeds
30+
filter: blob:none # https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/
31+
fetch-depth: 0 # Default is 1; need to set to 0 to get the benefits of blob:none.
32+
token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
3533
# required client_payload members:
3634
# branch_name - the target branch
3735
- run: |
@@ -40,5 +38,7 @@ jobs:
4038
git fetch origin main
4139
git merge origin/main --no-ff
4240
npm ci
43-
npm test
41+
npx hereby LKG
42+
git add --force ./lib
43+
git commit -m 'Update LKG'
4444
git push

.github/workflows/twoslash-repros.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,10 @@ jobs:
3434
runs-on: ubuntu-latest
3535
steps:
3636
- if: ${{ github.event.inputs.bisect }}
37-
uses: actions/checkout@v3
37+
uses: actions/checkout@v4
3838
with:
39-
fetch-depth: 0
39+
filter: blob:none # https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/
40+
fetch-depth: 0 # Default is 1; need to set to 0 to get the benefits of blob:none.
4041
- if: ${{ !github.event.inputs.bisect }}
4142
uses: actions/checkout@v3
4243
- uses: actions/setup-node@v3

.github/workflows/update-lkg.yml

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

.github/workflows/update-package-lock.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ jobs:
2121
runs-on: ubuntu-latest
2222
if: github.repository == 'microsoft/TypeScript'
2323

24-
permissions:
25-
contents: write
26-
2724
steps:
2825
- uses: actions/checkout@v3
2926
with:
@@ -46,7 +43,7 @@ jobs:
4643
echo "No change."
4744
else
4845
npm test
49-
npx hereby lkg
46+
npx hereby LKG
5047
git config user.email "[email protected]"
5148
git config user.name "TypeScript Bot"
5249
git add -f package-lock.json

0 commit comments

Comments
 (0)