Skip to content

Commit

Permalink
Fix: CI configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
joe223 committed Oct 22, 2019
1 parent c0971c1 commit 9a65c95
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 25 deletions.
27 changes: 5 additions & 22 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,32 +23,15 @@ jobs:
- v1-dependencies-{{ checksum "package.json" }}
# fallback to using the latest cache if no exact match is found
- v1-dependencies-

- run: yarn
# TODO - get this cached so that you don't have to pull down the binaries each time
- run:
name: Update
working_directory: /
command: |
sudo apt-get update -y
- run:
name: Update
working_directory: /
command: |
sudo apt-get upgrade -y
- run:
name: Install Chrome headless dependencies
working_directory: /
command: |
sudo apt-get install -yq gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 \
libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 \
libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 \
libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 \
ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget --fix-missing
name: Workaround for GoogleChrome/puppeteer#290
command: 'sh ./build/setup_puppeteer.sh'
- run: yarn
- save_cache:
paths:
- node_modules
key: v1-dependencies-{{ checksum "package.json" }}

# run tests!
- run: npm test
- run: npm run build
- run: npm run test
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ before_install:
install:
- yarn
script:
- npm run build
- npm run test
- npm run coverage
- npm run build
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"@babel/core": "^7.6.4",
"@babel/preset-env": "^7.6.3",
"codecov": "^3.6.1",
"cross-env": "^6.0.3",
"expect": "^24.9.0",
"finalhandler": "^1.1.2",
"husky": "^3.0.9",
Expand Down
4 changes: 2 additions & 2 deletions test/setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ const globalVariables = {
}
const opts = {
headless: true,
timeout: 10000,
args: ['--no-sandbox', '--disable-setuid-sandbox']
timeout: 10000
}

before (async function () {
this.timeout(10000)
global.expect = expect
global.browser = await puppeteer.launch(opts)
global.entryPath = `http://localhost:${server.address().port}/test/index.html`
Expand Down

0 comments on commit 9a65c95

Please sign in to comment.