Skip to content

Commit

Permalink
Merge branch 'master' into protocol_dump
Browse files Browse the repository at this point in the history
  • Loading branch information
JoelEinbinder authored Feb 12, 2020
2 parents 6a714a6 + 7ce49c2 commit 83dfbf4
Show file tree
Hide file tree
Showing 37 changed files with 899 additions and 1,005 deletions.
38 changes: 0 additions & 38 deletions .github/workflows/chromium-linux.yml

This file was deleted.

32 changes: 0 additions & 32 deletions .github/workflows/chromium-windows.yml

This file was deleted.

35 changes: 0 additions & 35 deletions .github/workflows/firefox-linux.yml

This file was deleted.

32 changes: 0 additions & 32 deletions .github/workflows/firefox-windows.yml

This file was deleted.

29 changes: 29 additions & 0 deletions .github/workflows/infra.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: "infra"

on:
push:
branches:
- master
pull_request:
branches:
- master

env:
CI: true

jobs:
doc-and-lint:
name: "docs & lint"
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
with:
node-version: 10.15
- name: install required packages
run: |
sudo apt-get update
sudo apt-get install libgbm-dev
sudo apt-get install xvfb
- run: npm install
- run: npm run lint
125 changes: 125 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
name: tests

on:
push:
branches:
- master
pull_request:
branches:
- master

env:
CI: true

jobs:
tests_linux_chromium:
name: "Linux + CR"
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
with:
node-version: 10.15
- name: install required packages
run: |
sudo apt-get update
sudo apt-get install libgbm-dev xvfb
- run: npm install
- run: xvfb-run --auto-servernum npm run ccoverage

tests_linux_firefox:
name: "Linux + FF"
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
with:
node-version: 10.15
- name: install required packages
run: |
sudo apt-get update
sudo apt-get install xvfb
- run: npm install
- run: xvfb-run --auto-servernum npm run fcoverage

tests_linux_webkit:
name: "Linux + WK"
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
with:
node-version: 10.15
- name: install required packages
run: |
sudo apt-get update
sudo apt-get install libwoff1 libopus0 libwebp6 libwebpdemux2 libenchant1c2a libgudev-1.0-0 libsecret-1-0 libhyphen0 libgdk-pixbuf2.0-0 libegl1 libgles2 libevent-2.1-6 libnotify4 libxslt1.1
sudo apt-get install xvfb
- run: npm install
- run: xvfb-run --auto-servernum npm run wcoverage

tests_win_chromium:
name: "Win + CR"
runs-on: windows-latest
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
with:
node-version: 10.15
- run: npm install
- run: npm run ctest

tests_win_firefox:
name: "Win + FF"
runs-on: windows-latest
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
with:
node-version: 10.15
- run: npm install
- run: npm run ftest

tests_win_webkit:
name: "Win + WK"
runs-on: windows-latest
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
with:
node-version: 10.15
- run: npm install
- run: npm run wtest

tests_mac_chromium:
name: "Mac + CR"
runs-on: macos-latest
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
with:
node-version: 10.15
- run: npm install
- run: npm run ctest

tests_mac_firefox:
name: "Mac + FF"
runs-on: macos-latest
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
with:
node-version: 10.15
- run: npm install
- run: npm run ftest

tests_mac_webkit:
name: "Mac + WK"
runs-on: macos-latest
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
with:
node-version: 10.15
- run: npm install
- run: npm run wtest
40 changes: 0 additions & 40 deletions .github/workflows/webkit-linux.yml

This file was deleted.

32 changes: 0 additions & 32 deletions .github/workflows/webkit-windows.yml

This file was deleted.

2 changes: 1 addition & 1 deletion browser_patches/firefox/BUILD_NUMBER
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1027
1028
7 changes: 6 additions & 1 deletion browser_patches/firefox/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ else
fi

./mach build

OBJ_FOLDER=$(ls -1 | grep obj-)
node ../install-preferences.js $PWD/$OBJ_FOLDER/dist/bin
if [[ "$(uname)" == "Darwin" ]]; then
node ../install-preferences.js $PWD/$OBJ_FOLDER/dist
else
node ../install-preferences.js $PWD/$OBJ_FOLDER/dist/bin
fi

Loading

0 comments on commit 83dfbf4

Please sign in to comment.