Skip to content

Commit

Permalink
chore: fix travis config (#6537)
Browse files Browse the repository at this point in the history
  • Loading branch information
jackfranklin committed Oct 22, 2020
1 parent c756fb4 commit e6b8c77
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 19 deletions.
32 changes: 16 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ services: xvfb

jobs:
include:
- os: "osx"
- os: 'osx'
name: 'Unit tests: macOS/Chromium'
node_js: "10.19.0"
node_js: '10.19.0'
osx_image: xcode11.4
env:
- CHROMIUM=true
Expand All @@ -14,11 +14,11 @@ jobs:
script:
- ls .local-chromium .local-firefox
- npm run tsc
- travis_retry npm run unit
- npm run unit

- os: "windows"
- os: 'windows'
name: 'Unit tests: Windows/Chromium'
node_js: "10.19.0"
node_js: '10.19.0'
env:
- CHROMIUM=true
before_install:
Expand All @@ -29,7 +29,7 @@ jobs:
- travis_retry npm run unit

# Runs unit tests on Linux + Chromium
- node_js: "10.19.0"
- node_js: '10.19.0'
name: 'Unit tests [with coverage]: Linux/Chromium'
env:
- CHROMIUM=true
Expand All @@ -39,35 +39,35 @@ jobs:
- travis_retry npm run unit-with-coverage
- npm run assert-unit-coverage

- node_js: "12.16.3"
- node_js: '12.16.3'
name: 'Unit tests [Node 12]: Linux/Chromium'
env:
- CHROMIUM=true
before_install:
- PUPPETEER_PRODUCT=firefox npm install
script:
- travis_retry npm run unit
- npm run unit

- node_js: "14.2.0"
- node_js: '14.2.0'
name: 'Unit tests [Node 14]: Linux/Chromium'
env:
- CHROMIUM=true
before_install:
- PUPPETEER_PRODUCT=firefox npm install
script:
- travis_retry npm run unit
- npm run unit

- node_js: "12.16.3"
- node_js: '12.16.3'
name: 'Browser tests: Linux/Chromium'
addons:
chrome: stable
env:
- CHROMIUM=true
script:
- travis_retry npm run test-browser
- npm run test-browser

# This bot runs all the extra checks that aren't the main Puppeteer unit tests
- node_js: "10.19.0"
- node_js: '10.19.0'
name: 'Extra tests: Linux/Chromium'
env:
- CHROMIUM=true
Expand All @@ -79,22 +79,22 @@ jobs:

# This bot runs separately as it changes package.json to test puppeteer-core
# and we don't want that leaking into other bots and causing issues.
- node_js: "10.19.0"
- node_js: '10.19.0'
name: 'Test bundling and install of packages'
env:
- CHROMIUM=true
script:
- npm run test-install

# Runs unit tests on Linux + Firefox
- node_js: "10.19.0"
- node_js: '10.19.0'
name: 'Unit tests: Linux/Firefox'
env:
- FIREFOX=true
before_install:
- PUPPETEER_PRODUCT=firefox npm install
script:
- travis_retry npm run funit
- npm run funit

notifications:
email: false
4 changes: 2 additions & 2 deletions mocha-config/puppeteer-unit-tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ module.exports = {
require: ['./test/mocha-ts-require', './test/mocha-utils.ts'],
spec: 'test/*.spec.ts',
extension: ['js', 'ts'],
parallel: process.env.CI && !process.env.COVERAGE,
// retry twice more, so we run each test up to 3 times if needed.
retries: process.env.CI ? 2 : 0,
parallel: !!process.env.PARALLEL,
timeout: 25 * 1000,
reporter: process.env.CI ? 'spec' : 'dot',
};
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
"jpeg-js": "^0.3.7",
"mime": "^2.0.3",
"minimist": "^1.2.0",
"mocha": "^8.1.3",
"mocha": "^8.2.0",
"ncp": "^2.0.0",
"pixelmatch": "^4.0.2",
"pngjs": "^5.0.0",
Expand Down

0 comments on commit e6b8c77

Please sign in to comment.