Skip to content

Commit

Permalink
Merge branch 'master' into beta
Browse files Browse the repository at this point in the history
  • Loading branch information
pvdlg committed Dec 5, 2019
2 parents 0716a45 + a373f8b commit c16fcc9
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 31 deletions.
38 changes: 7 additions & 31 deletions .travis.yml
@@ -1,35 +1,11 @@
language: node_js
version: ~> 1.0

services:
- docker

node_js:
- 12
- 10.13

# Trigger a push build on release and greenkeeper branches + PRs build on every branches
# Avoid double build on PRs (See https://github.com/travis-ci/travis-ci/issues/1147)
branches:
only:
- master
- next
- beta
- /^\d+\.(\d+|x)(\.x)?$/
- /^greenkeeper.*$/

# Retry install on fail to avoid failing a build on network/disk/external errors
install:
- travis_retry npm install

script:
- npm run test

after_success:
- npm run codecov

jobs:
include:
- stage: release
node_js: lts/*
script:
- npm run semantic-release
import:
- .travis/node.yml
- .travis/node-versions.yml
- .travis/semantic-release.yml
- .travis/greenkeeper.yml
- .travis/codecov.yml
2 changes: 2 additions & 0 deletions .travis/codecov.yml
@@ -0,0 +1,2 @@
after_success:
- npm run codecov
3 changes: 3 additions & 0 deletions .travis/greenkeeper.yml
@@ -0,0 +1,3 @@
branches:
only:
- /^greenkeeper.*$/
3 changes: 3 additions & 0 deletions .travis/node-versions.yml
@@ -0,0 +1,3 @@
node_js:
- 12
- 10.13
11 changes: 11 additions & 0 deletions .travis/node.yml
@@ -0,0 +1,11 @@
language: node_js

cache:
npm: false

# Retry install on fail to avoid failing a build on network/disk/external errors
install:
- travis_retry npm install

script:
- npm run test
15 changes: 15 additions & 0 deletions .travis/semantic-release.yml
@@ -0,0 +1,15 @@
branches:
only:
- master
- next
- beta
- /^\d+\.(\d+|x)(\.x)?$/

jobs:
include:
- stage: release
node_js: lts/*
install:
- travis_retry npm install
script:
- npm run semantic-release

0 comments on commit c16fcc9

Please sign in to comment.