Skip to content

Commit 022bdea

Browse files
Backport package-lock infra changes to 3.9 (#44608)
From #40146 From #40703 Fixes #40692 Also Co-authored-by: Andrew Casey <[email protected]>
1 parent ebeafcf commit 022bdea

7 files changed

+37
-11
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
sed -i -e 's/const versionMajorMinor = ".*"/const versionMajorMinor = "${{ github.event.client_payload.core_major_minor }}"/g' tests/baselines/reference/api/typescript.d.ts
2424
sed -i -e 's/const versionMajorMinor = ".*"/const versionMajorMinor = "${{ github.event.client_payload.core_major_minor }}"/g' tests/baselines/reference/api/tsserverlibrary.d.ts
2525
sed -i -e 's/const version = `${versionMajorMinor}.0-.*`/const version = `${versionMajorMinor}.0-${{ github.event.client_payload.core_tag || 'dev' }}`/g' src/compiler/corePublic.ts
26-
npm install
26+
npm ci
2727
gulp LKG
2828
npm test
2929
git diff
@@ -32,7 +32,7 @@ jobs:
3232
git add tests/baselines/reference/api/typescript.d.ts
3333
git add tests/baselines/reference/api/tsserverlibrary.d.ts
3434
git add ./lib
35-
git config user.email "ts_bot@rcavanaugh.com"
35+
git config user.email "typescriptbot@microsoft.com"
3636
git config user.name "TypeScript Bot"
3737
git commit -m 'Bump version to ${{ github.event.client_payload.package_version }} and LKG'
3838
git push --set-upstream origin ${{ github.event.client_payload.branch_name }}

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ jobs:
2121
npm uninstall tslint --no-save
2222
- name: npm install and test
2323
run: |
24-
npm install
25-
npm update
24+
npm ci
2625
npm test
2726
env:
2827
CI: true
@@ -41,4 +40,3 @@ jobs:
4140
with:
4241
name: tgz
4342
path: typescript.tgz
44-

.github/workflows/set-version.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
sed -i -e 's/const versionMajorMinor = ".*"/const versionMajorMinor = "${{ github.event.client_payload.core_major_minor }}"/g' tests/baselines/reference/api/typescript.d.ts
3030
sed -i -e 's/const versionMajorMinor = ".*"/const versionMajorMinor = "${{ github.event.client_payload.core_major_minor }}"/g' tests/baselines/reference/api/tsserverlibrary.d.ts
3131
sed -i -e 's/const version = .*;/const version = "${{ github.event.client_payload.package_version }}" as string;/g' src/compiler/corePublic.ts
32-
npm install
32+
npm ci
3333
gulp LKG
3434
npm test
3535
git diff
@@ -38,7 +38,7 @@ jobs:
3838
git add tests/baselines/reference/api/typescript.d.ts
3939
git add tests/baselines/reference/api/tsserverlibrary.d.ts
4040
git add ./lib
41-
git config user.email "ts_bot@rcavanaugh.com"
41+
git config user.email "typescriptbot@microsoft.com"
4242
git config user.name "TypeScript Bot"
4343
git commit -m 'Bump version to ${{ github.event.client_payload.package_version }} and LKG'
4444
git push

.github/workflows/sync-branch.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
# required client_payload members:
2121
# branch_name - the target branch
2222
- run: |
23-
git config user.email "ts_bot@rcavanaugh.com"
23+
git config user.email "typescriptbot@microsoft.com"
2424
git config user.name "TypeScript Bot"
2525
git fetch origin master
2626
git merge master --no-ff
27-
npm install
27+
npm ci
2828
npm test
2929
git push

.github/workflows/update-lkg.yml

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Update LKG
2+
3+
on:
4+
workflow_dispatch: {}
5+
6+
jobs:
7+
build:
8+
runs-on: ubuntu-latest
9+
10+
steps:
11+
- uses: actions/checkout@v2
12+
- name: Use node version 12
13+
uses: actions/setup-node@v1
14+
with:
15+
node-version: 12
16+
registry-url: https://registry.npmjs.org/
17+
18+
- name: Configure Git and Update LKG
19+
run: |
20+
git config user.email "[email protected]"
21+
git config user.name "TypeScript Bot"
22+
npm ci
23+
gulp LKG
24+
npm test
25+
git diff
26+
git add ./lib
27+
git commit -m "Update LKG"
28+
git push

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
FROM node:current
33
COPY . /typescript
44
WORKDIR /typescript
5-
RUN npm install
5+
RUN npm ci
66
RUN npm i -g gulp-cli
77
RUN gulp configure-insiders && gulp LKG && gulp clean && npm pack .

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Install [Gulp](https://gulpjs.com/) tools and dev dependencies:
6767

6868
```bash
6969
npm install -g gulp
70-
npm install
70+
npm ci
7171
```
7272

7373
Use one of the following to build and test:

0 commit comments

Comments
 (0)