Skip to content

Commit c99b802

Browse files
Merge branch 'main' into release-4.7
2 parents 6e62273 + 1a4643b commit c99b802

File tree

1,661 files changed

+200119
-172548
lines changed

Some content is hidden

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

1,661 files changed

+200119
-172548
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ jobs:
99

1010
steps:
1111
- uses: actions/checkout@v2
12-
- name: Use node version 12
13-
uses: actions/setup-node@v1
12+
- name: Use node version 14
13+
uses: actions/setup-node@v3
1414
with:
15-
node-version: 12
15+
node-version: 14
1616
registry-url: https://registry.npmjs.org/
1717

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

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ jobs:
1616

1717
strategy:
1818
matrix:
19-
node-version: [12.x, 14.x, 16.x]
19+
node-version: [14.x, 16.x, 18.x]
2020

2121
steps:
22-
- uses: actions/checkout@v2
22+
- uses: actions/checkout@v3
2323
with:
2424
fetch-depth: 5
2525
- name: Use node version ${{ matrix.node-version }}
26-
uses: actions/setup-node@v1
26+
uses: actions/setup-node@v3
2727
with:
2828
node-version: ${{ matrix.node-version }}
2929
- name: Remove existing TypeScript

.github/workflows/codeql.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ jobs:
1111

1212
# CodeQL runs on ubuntu-latest and windows-latest
1313
runs-on: ubuntu-latest
14+
if: github.repository == 'microsoft/TypeScript'
1415

1516
steps:
1617
- name: Checkout repository

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ on:
1414
jobs:
1515
build:
1616
runs-on: ubuntu-latest
17+
if: github.repository == 'microsoft/TypeScript'
1718

1819
steps:
1920
- name: Configure git

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ jobs:
99
runs-on: ubuntu-latest
1010

1111
steps:
12-
- name: Use node version 12.x
13-
uses: actions/setup-node@v1
12+
- name: Use node version 14.x
13+
uses: actions/setup-node@v3
1414
with:
15-
node-version: 12.x
15+
node-version: 14.x
1616
- uses: actions/checkout@v2
1717
with:
1818
fetch-depth: 5

.github/workflows/nightly.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@ on:
1111
jobs:
1212
build:
1313
runs-on: ubuntu-latest
14+
if: github.repository == 'microsoft/TypeScript'
1415

1516
steps:
1617
- uses: actions/checkout@v2
17-
- name: Use node version 12
18-
uses: actions/setup-node@v1
18+
- name: Use node version 14
19+
uses: actions/setup-node@v3
1920
with:
20-
node-version: 12
21+
node-version: 14
2122
registry-url: https://registry.npmjs.org/
2223
- name: Setup and publish nightly
2324
run: |

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111

1212
steps:
1313
- uses: actions/checkout@v2
14-
- name: Use node version 12
15-
uses: actions/setup-node@v1
14+
- name: Use node version 14
15+
uses: actions/setup-node@v3
1616
with:
17-
node-version: 12
17+
node-version: 14
1818
- name: Remove existing TypeScript
1919
run: |
2020
npm uninstall typescript --no-save

.github/workflows/rich-navigation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
with:
2020
fetch-depth: 5
2121

22-
- uses: actions/setup-node@v2
22+
- uses: actions/setup-node@v3
2323
with:
2424
node-version: 14
2525

.github/workflows/set-version.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ jobs:
99
runs-on: ubuntu-latest
1010

1111
steps:
12-
- name: Use node version 12.x
13-
uses: actions/setup-node@v1
12+
- name: Use node version 14.x
13+
uses: actions/setup-node@v3
1414
with:
15-
node-version: 12.x
15+
node-version: 14.x
1616
- uses: actions/checkout@v2
1717
with:
1818
ref: ${{ github.event.client_payload.branch_name }}

.github/workflows/sync-branch.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
runs-on: ubuntu-latest
1515

1616
steps:
17-
- name: Use node version 12.x
18-
uses: actions/setup-node@v1
17+
- name: Use node version 14.x
18+
uses: actions/setup-node@v3
1919
with:
20-
node-version: 12.x
20+
node-version: 14.x
2121
- uses: actions/checkout@v2
2222
with:
2323
ref: ${{ github.event.inputs.branch_name || github.event.client_payload.branch_name }}

.github/workflows/twoslash-repros.yaml

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,38 @@ on:
88
- cron: '0 8 * * *'
99
repository_dispatch:
1010
types: run-twoslash-repros
11+
issues:
12+
types:
13+
- labeled
14+
workflow_dispatch:
15+
inputs:
16+
bisect_issue:
17+
description: Triggers a bisect request on the given issue number instead of updating repros on all issues
18+
required: false
19+
type: string
1120

1221
jobs:
13-
build:
22+
run:
23+
if: ${{ github.repository == 'microsoft/TypeScript' && !github.event.label && !github.event.inputs.bisect_issue }}
1424
runs-on: ubuntu-latest
1525
steps:
1626
- name: Use node
17-
uses: actions/setup-node@v1
18-
- run: |
19-
npm init -y
20-
npm install --save typescript@next
27+
uses: actions/setup-node@v3
2128
- uses: microsoft/TypeScript-Twoslash-Repro-Action@master
2229
with:
2330
github-token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
31+
32+
bisect:
33+
if: ${{ github.event.label.name == 'Bisect Repro' || github.event.inputs.bisect_issue }}
34+
runs-on: ubuntu-latest
35+
steps:
36+
- uses: actions/checkout@v3
37+
with:
38+
fetch-depth: 0
39+
- uses: actions/setup-node@v3
40+
with:
41+
node-version: 16
42+
- uses: microsoft/TypeScript-Twoslash-Repro-Action@master
43+
with:
44+
github-token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
45+
bisect: ${{ github.event.issue.number || github.event.inputs.bisect_issue }}

.github/workflows/update-lkg.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ jobs:
99

1010
steps:
1111
- uses: actions/checkout@v2
12-
- name: Use node version 12
13-
uses: actions/setup-node@v1
12+
- name: Use node version 14
13+
uses: actions/setup-node@v3
1414
with:
15-
node-version: 12
15+
node-version: 14
1616
registry-url: https://registry.npmjs.org/
1717

1818
- name: Configure Git and Update LKG

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@ on:
1010
jobs:
1111
build:
1212
runs-on: ubuntu-latest
13+
if: github.repository == 'microsoft/TypeScript'
1314

1415
steps:
1516
- uses: actions/checkout@v2
16-
- uses: actions/setup-node@v1
17+
- uses: actions/setup-node@v3
1718
with:
18-
node-version: 12
19+
node-version: 14
1920
registry-url: https://registry.npmjs.org/
2021

2122
- name: Configure git and update package-lock.json

AUTHORS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ TypeScript is authored by:
169169
- Gabriel Isenberg
170170
- Gabriela Araujo Britto
171171
- Gabriela Britto
172+
- Gao Sheng
172173
- gb714us
173174
- Gilad Peleg
174175
- Godfrey Chan

0 commit comments

Comments
 (0)