Skip to content

Commit

Permalink
Revert "devops: add package-lock.json (#1859)"
Browse files Browse the repository at this point in the history
This reverts commit 75f35e4.

It is unclear how to add/remove dependencies now.
  • Loading branch information
pavelfeldman committed Apr 19, 2020
1 parent 75f35e4 commit 92b6bc0
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 5,772 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ build: off

install:
- ps: Install-Product node $env:nodejs_version
- npm ci
- npm install
- npm run ctest
- npm run wtest
- npm run ftest
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
key: dependency-cache-{{ checksum "package.json" }}

- run:
command: npm ci
command: npm install

- save_cache:
key: dependency-cache-{{ checksum "package.json" }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/infra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ jobs:
sudo apt-get update
sudo apt-get install libgbm-dev
sudo apt-get install xvfb
- run: npm ci
- run: npm install
- run: npm run lint
24 changes: 24 additions & 0 deletions .github/workflows/rebase.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
on:
issue_comment:
types: [created]
name: Automatic Rebase
jobs:
rebase:
name: Rebase
if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase')
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
with:
fetch-depth: 0
- name: Automatic Rebase
uses: cirrus-actions/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# https://github.community/t5/GitHub-Actions/Workflow-is-failing-if-no-job-can-be-ran-due-to-condition/m-p/38186#M3250
always_job:
name: Always run job
runs-on: ubuntu-latest
steps:
- name: Always run
run: echo "This job is used to prevent the workflow to fail when all other jobs are skipped."
20 changes: 10 additions & 10 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: install xvfb
run: |
sudo apt-get install xvfb
- run: npm ci
- run: npm install
# XVFB-RUN merges both STDOUT and STDERR, whereas we need only STDERR
# Wrap `npm run` in a subshell to redirect STDERR to file.
- run: xvfb-run --auto-servernum -- bash -c "npm run ccoverage 2>./chromium-linux-testrun.log"
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
with:
node-version: 10
- uses: microsoft/playwright-github-action@v1
- run: npm ci
- run: npm install
- run: npm run ctest 2>./chromium-mac-testrun.log
env:
DEBUG: "*"
Expand All @@ -82,7 +82,7 @@ jobs:
with:
node-version: 10
- uses: microsoft/playwright-github-action@v1
- run: npm ci
- run: npm install
- run: npm run ctest 2>./chromium-win-testrun.log
shell: bash
env:
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
- name: install xvfb
run: |
sudo apt-get install xvfb
- run: npm ci
- run: npm install
# XVFB-RUN merges both STDOUT and STDERR, whereas we need only STDERR
# Wrap `npm run` in a subshell to redirect STDERR to file.
- run: xvfb-run --auto-servernum -- bash -c "npm run wcoverage 2>./webkit-linux-testrun.log"
Expand Down Expand Up @@ -142,7 +142,7 @@ jobs:
with:
node-version: 10
- uses: microsoft/playwright-github-action@v1
- run: npm ci
- run: npm install
- run: npm run wtest 2>./webkit-mac-testrun.log
env:
DEBUG: "*,-pw:wrapped*"
Expand All @@ -169,7 +169,7 @@ jobs:
with:
node-version: 10
- uses: microsoft/playwright-github-action@v1
- run: npm ci
- run: npm install
- run: npm run wtest 2>./webkit-win-testrun.log
shell: bash
env:
Expand Down Expand Up @@ -200,7 +200,7 @@ jobs:
- name: install xvfb
run: |
sudo apt-get install xvfb
- run: npm ci
- run: npm install
# XVFB-RUN merges both STDOUT and STDERR, whereas we need only STDERR
# Wrap `npm run` in a subshell to redirect STDERR to file.
- run: xvfb-run --auto-servernum -- bash -c "npm run fcoverage 2>./firefox-linux-testrun.log"
Expand Down Expand Up @@ -229,7 +229,7 @@ jobs:
with:
node-version: 10
- uses: microsoft/playwright-github-action@v1
- run: npm ci
- run: npm install
- run: npm run ftest 2>./firefox-mac-testrun.log
env:
DEBUG: "*"
Expand All @@ -256,7 +256,7 @@ jobs:
with:
node-version: 10
- uses: microsoft/playwright-github-action@v1
- run: npm ci
- run: npm install
- run: npm run ftest 2>./firefox-win-testrun.log
shell: bash
env:
Expand Down Expand Up @@ -285,5 +285,5 @@ jobs:
# we use in `installation-tests.sh`.
node-version: 12
- uses: microsoft/playwright-github-action@v1
- run: npm ci
- run: npm install
- run: bash test/installation-tests/installation-tests.sh
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
*.swp
*.pyc
.vscode
package-lock.json
yarn.lock
/node6
/src/generated/*
Expand Down
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ addons:
- xvfb
notifications:
email: false
install:
- npm ci
cache:
directories:
- node_modules
Expand Down
Loading

0 comments on commit 92b6bc0

Please sign in to comment.