Skip to content

Commit

Permalink
Merge branch 'main' into staleErrors
Browse files Browse the repository at this point in the history
  • Loading branch information
sheetalkamat committed Jun 8, 2022
2 parents 8cd3af8 + 7e4a96e commit 0d246cc
Show file tree
Hide file tree
Showing 632 changed files with 32,965 additions and 17,961 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/accept-baselines-fix-lints.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,7 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Use node version 14
uses: actions/setup-node@v3
with:
node-version: 14
registry-url: https://registry.npmjs.org/
- uses: actions/setup-node@v3

- name: Configure Git, Run Tests, Update Baselines, Apply Fixes
run: |
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@ jobs:

strategy:
matrix:
node-version: [14.x, 16.x, 18.x]
# Test the latest version of Node.js plus the last two LTS versions.
node-version:
- "*"
- lts/*
- lts/-1

steps:
- uses: actions/checkout@v3
Expand All @@ -26,6 +30,7 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
check-latest: true
- name: Remove existing TypeScript
run: |
npm uninstall typescript --no-save
Expand All @@ -47,4 +52,3 @@ jobs:

- name: Validate the browser can import TypeScript
run: gulp test-browser-integration

5 changes: 1 addition & 4 deletions .github/workflows/new-release-branch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Use node version 14.x
uses: actions/setup-node@v3
with:
node-version: 14.x
- uses: actions/setup-node@v3
- uses: actions/checkout@v2
with:
fetch-depth: 5
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Use node version 14
uses: actions/setup-node@v3
- uses: actions/setup-node@v3
with:
node-version: 14
# Use NODE_AUTH_TOKEN environment variable to authenticate to this registry.
registry-url: https://registry.npmjs.org/
- name: Setup and publish nightly
run: |
Expand All @@ -31,5 +30,3 @@ jobs:
npm publish --tag next
env:
NODE_AUTH_TOKEN: ${{secrets.npm_token}}
CI: true

11 changes: 2 additions & 9 deletions .github/workflows/release-branch-artifact.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Use node version 14
uses: actions/setup-node@v3
with:
node-version: 14
- uses: actions/setup-node@v3
- name: Remove existing TypeScript
run: |
npm uninstall typescript --no-save
Expand All @@ -23,10 +20,8 @@ jobs:
run: |
npm ci
npm test
env:
CI: true
- name: Adding playwright
run: npm install --no-save --no-package-lock playwright
run: npm install --no-save --no-package-lock playwright
- name: Validate the browser can import TypeScript
run: gulp test-browser-integration
- name: LKG, clean, and pack
Expand All @@ -35,8 +30,6 @@ jobs:
gulp clean
npm pack ./
mv typescript-*.tgz typescript.tgz
env:
CI: true
- name: Upload built tarfile
uses: actions/upload-artifact@v1
with:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/rich-navigation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ jobs:
fetch-depth: 5

- uses: actions/setup-node@v3
with:
node-version: 14

- name: Install dependencies
run: npm ci
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/set-version.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Use node version 14.x
uses: actions/setup-node@v3
with:
node-version: 14.x
- uses: actions/setup-node@v3
- uses: actions/checkout@v2
with:
ref: ${{ github.event.client_payload.branch_name }}
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/sync-branch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Use node version 14.x
uses: actions/setup-node@v3
with:
node-version: 14.x
- uses: actions/setup-node@v3
- uses: actions/checkout@v2
with:
ref: ${{ github.event.inputs.branch_name || github.event.client_payload.branch_name }}
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/twoslash-repros.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,11 @@ jobs:
if: ${{ github.repository == 'microsoft/TypeScript' && !github.event.label && !github.event.inputs.bisect_issue }}
runs-on: ubuntu-latest
steps:
- name: Use node
uses: actions/setup-node@v3
- uses: actions/setup-node@v3
- uses: microsoft/TypeScript-Twoslash-Repro-Action@master
with:
with:
github-token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}

bisect:
if: ${{ github.event.label.name == 'Bisect Repro' || github.event.inputs.bisect_issue }}
runs-on: ubuntu-latest
Expand All @@ -37,9 +36,7 @@ jobs:
with:
fetch-depth: 0
- uses: actions/setup-node@v3
with:
node-version: 16
- uses: microsoft/TypeScript-Twoslash-Repro-Action@master
with:
with:
github-token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
bisect: ${{ github.event.issue.number || github.event.inputs.bisect_issue }}
6 changes: 1 addition & 5 deletions .github/workflows/update-lkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,7 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Use node version 14
uses: actions/setup-node@v3
with:
node-version: 14
registry-url: https://registry.npmjs.org/
- uses: actions/setup-node@v3

- name: Configure Git and Update LKG
run: |
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/update-package-lock.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,12 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: 14
registry-url: https://registry.npmjs.org/

- name: Configure git and update package-lock.json
run: |
git config user.email "typescriptbot@microsoft.com"
git config user.name "TypeScript Bot"
npm install --package-lock-only
npm install --package-lock-only --ignore-scripts
git add -f package-lock.json
if git commit -m "Update package-lock.json"; then
git push
Expand Down
54 changes: 27 additions & 27 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 0d246cc

Please sign in to comment.