Skip to content

Commit

Permalink
Merge pull request #39989 from amcasey/pinned-release-4.0
Browse files Browse the repository at this point in the history
Pin dependencies in release branch
  • Loading branch information
amcasey authored Aug 13, 2020
2 parents f88f306 + 47c23aa commit edaa8aa
Show file tree
Hide file tree
Showing 5 changed files with 8,783 additions and 9 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

strategy:
matrix:
node-version: [10.x, 12.x, 13.x]
node-version: [10.x, 12.x, 14.x]

steps:
- uses: actions/checkout@v2
Expand All @@ -30,8 +30,7 @@ jobs:
run: |
npm uninstall typescript --no-save
npm uninstall tslint --no-save
- run: npm install
- run: npm update
- run: npm ci

# Re: https://github.com/actions/setup-node/pull/125
- name: Register Problem Matcher for TSC
Expand All @@ -45,4 +44,4 @@ jobs:

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

1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ tests/cases/user/*/**/*.d.ts
tests/baselines/reference/dt
.failed-tests
TEST-results.xml
package-lock.json
tests/cases/user/TypeScript-React-Starter/TypeScript-React-Starter
tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter
tests/cases/user/TypeScript-React-Native-Starter/TypeScript-React-Native-Starter
Expand Down
1 change: 0 additions & 1 deletion .npmrc

This file was deleted.

6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
language: node_js

node_js:
- 'node'
- '14'
- '12'
- '10'
- '8'

env:
- workerCount=3 timeout=600000
Expand All @@ -18,7 +18,7 @@ branches:

install:
- npm uninstall typescript --no-save
- npm install
- npm ci

cache:
directories:
Expand Down
Loading

0 comments on commit edaa8aa

Please sign in to comment.